Merge pull request #99 from kjirou/consider-timezone-with-now-command

nowコマンドへ設定値のタイムゾーンを参照させる

src/__tests__/index.test.ts

@@ -44,20 +44,19 @@ describe("executeHelp", () => {
 });
 
 describe("executeNow", () => {
-  beforeEach(() => {
-    jest.useFakeTimers();
-    jest.setSystemTime(new Date("2019-01-01 00:00:00+0000"));
-  });
-
   afterEach(() => {
     jest.useRealTimers();
   });
-
-  it("should return a date-time string formatted with UTC", () => {
-    return executeNow().then((result) => {
-      expect(result.exitCode).toBe(0);
-      expect(result.message).toBe("2019-01-01 00:00:00+0000");
-    });
+  test("タイムゾーンを考慮したDateTime文字列を返す", async () => {
+    jest.useFakeTimers();
+    jest.setSystemTime(new Date("2019-01-01 00:00:00+0000"));
+    await executeInit(workspaceRoot);
+    const configFilePath = path.join(workspaceRoot, "ubw-configs.js");
+    const result = await executeNow(configFilePath);
+    expect(result.exitCode).toBe(0);
+    // TODO: ubw-configs.js が Pure Object ではなく関数を返すので、timezone の値を Asia/Tokyo などにできない
+    //       他のタイムゾーンでテストしたい時は、現状は `createDefaultUbwConfigs` の戻り値を直接書き換える必要がある
+    expect(result.message).toBe("2019-01-01 00:00:00+0000");
   });
 });
 

src/cli.ts

@@ -80,8 +80,12 @@ const commandList: Record<string, Command> = {
     );
     return executeInit(destinationDirPath);
   },
-  now: () => {
-    return executeNow();
+  now: ({ subCommandArgv, cwd, defaultConfigFilePath }) => {
+    const options = minimist(subCommandArgv);
+    const configFilePath = options["config-file"]
+      ? cliUtils.toNormalizedAbsolutePath(options["config-file"], cwd)
+      : defaultConfigFilePath;
+    return executeNow(configFilePath);
   },
   unknown: () => {
     return Promise.resolve({

src/index.ts

@@ -202,6 +202,7 @@ export function executeInit(blogRoot: string): Promise<CommandResult> {
   const initialConfigs = createInitialUbwConfigs();
   const configs = fillWithDefaultUbwConfigs(initialConfigs);
 
+  // TODO: 関数にしている理由が不明。ユニットテストで値を書き換えられなくて不便。
   const configFileSource = [
     "module.exports = function ubwConfigs() {",
     `return ${JSON.stringify(initialConfigs, null, 2)};`
@@ -229,10 +230,11 @@ export function executeInit(blogRoot: string): Promise<CommandResult> {
   });
 }
 
-export function executeNow(): Promise<CommandResult> {
+export function executeNow(configFilePath: string): Promise<CommandResult> {
+  const settings = requireSettings(configFilePath);
   return Promise.resolve({
     exitCode: 0,
-    message: generateDateTimeString(new Date(), "UTC", {
+    message: generateDateTimeString(new Date(), settings.configs.timeZone, {
       timeZoneSuffix: true,
     }),
   });