journal-cli 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10242acbf794f1f5e37dc3a2048c248d15c3b478e6e07ef715bb9805e7d76422
-  data.tar.gz: 68e6a0adce0a131e1d23d2e8ab0e513f1c4e609f18cd7e1d9ca5a8e8916c3352
+  metadata.gz: f3855c36879c6970f3e312add21e3b1d4b8667c69d32d32d59389211a47ce87a
+  data.tar.gz: 8b7fe4a087f81ed075ad41bbfe84df52e250779fae1591719138d90dfbf6e093
 SHA512:
-  metadata.gz: 406045f38a8ba65d1d5bbec21f49dbb6024a0934a143b9968f00884b2f7d42b812ece2cfab320adc953174f4b8960d7c480b99f4866f00761f1eab7760baae56
-  data.tar.gz: ab3b5d5a3bf95420048bc0109b6f5cb6926c3ec10d4dc51e5eeeea852d0cf241ea88ff3253bdb2603e8af71585d2ea89f0dec9e44e11a752eb1cf4866a078080
+  metadata.gz: 81f6c91df724bd480d8c67284c23b7d1405f5bffbfb2a5626a03ede1444decd3fa6c77f1c55c8414ad65f7c3c1359f58e7a559d592ae43ac76cca4e1e0794be6
+  data.tar.gz: 756849fb99ee4e287a5e3943b35c3bb1d6b7d1a9cf72d9441b7c849060a80300d310809a8b6ac3e74d9f7b6afbdff4bf968891f020857746ca77773b15e2b09f

data/.gitignore

@@ -65,3 +65,4 @@ build-iPhoneSimulator/
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
 html
+*.bak

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.0.16
+
+2023-09-07 11:12
+
+#### IMPROVED
+
+- Use optparse for command line options
+- Completion-friendly list of journals with `journal -l`
+
+### 1.0.15
+
+2023-09-07 07:57
+
+#### FIXED
+
+- Messed up the fix for nested keys
+
 ### 1.0.14
 
 2023-09-07 07:35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    journal-cli (1.0.14)
+    journal-cli (1.0.16)
       chronic (~> 0.10, >= 0.10.2)
 
 GEM

data/bin/journal

@@ -2,17 +2,20 @@
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'journal-cli'
+require 'optparse'
 
 module Journal
   class << self
     def usage
-      puts "journal v#{Journal::VERSION}"
-      puts
       puts 'Usage: journal [type] [date]'
       puts
       puts 'Available journal types:'
+      list_journals
+    end
+
+    def list_journals
       config = Journal.config
-      puts(config['journals'].keys.map { |k| "- #{k}" })
+      puts config['journals'].keys
     end
 
     def run(args)
@@ -22,15 +25,6 @@ module Journal
         Process.exit 1
       end
 
-      case args[0]
-      when /(-v|--version)/
-        puts "journal v#{Journal::VERSION}"
-        Process.exit 0
-      when /(help|-h|--help)/
-        usage
-        Process.exit 0
-      end
-
       journal = args.shift
 
       date = if args.length.positive?
@@ -51,4 +45,29 @@ module Journal
   end
 end
 
+optparse = OptionParser.new do |opts|
+  opts.banner = 'Usage: journal JOURNAL_KEY [NATURAL LANGUAGE DATE]'
+
+  opts.on('-v', '--version', 'Display version') do
+    puts "journal v#{Journal::VERSION}"
+    Process.exit 0
+  end
+
+  opts.on('-l', '--list', 'List available journals') do
+    Journal.list_journals
+    Process.exit 0
+  end
+
+  opts.on('-h', '--help', 'Display help') do
+    puts opts
+    puts
+    puts 'Available journal types:'
+    config = Journal.config
+    puts(config['journals'].keys.map { |k| "- #{k}" })
+    Process.exit 0
+  end
+end
+
+optparse.parse!
+
 Journal.run(ARGV)

data/lib/journal-cli/checkin.rb

@@ -214,8 +214,6 @@ module Journal
         output[jk] = {}
         journal.answers.each do |k, v|
           if v.is_a? Hash
-            output[jk][k] = {}
-
             v.each do |key, value|
               result = case value.class.to_s
                        when /Weather/
@@ -224,17 +222,15 @@ module Journal
                          value
                        end
               if jk == k
-                output[jk] = result
+                output[jk][key] = result
               else
-                output[jk][k] = result
+                output[jk][k][key] = result
               end
             end
+          elsif jk == k
+            output[jk] = v
           else
-            if jk == k
-              output[jk] = v
-            else
-              output[jk][k] = v
-            end
+            output[jk][k] = v
           end
         end
       end

data/lib/journal-cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Journal
-  VERSION = '1.0.14'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journal-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Brett Terpstra