kbsecret 1.3.0.pre.3 → 1.3.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 917f766026ce5e43c4294706d146e44d159d0af0eebd4d088b8408bc85d7a6af
-  data.tar.gz: b7feb36ed986661d85076a19d1ad360ae099a2e0fadf09db9ccf6ba90b9fc84d
+  metadata.gz: ddd86d8a3994af1e1af0a7808160da68e05408b13bbf9754353c6edbe7971606
+  data.tar.gz: f7c63f25a2f1bfcd85ea5d9860cc4d8a8f90afdbd50ba9773fe3d1f82a49ba09
 SHA512:
-  metadata.gz: 59e7acebf02007b3ba23758496b5014723e2dfc9e735ae500bed07b83e2151e6f4462c5b156e6483dc1be867d5022efd911eff00d7202593baf45abf99941c89
-  data.tar.gz: 63e9b439194409c429a1fb404d18354f732520d33b0e7d95810b6acba14c052c8a036e1b6fb8128b4a18c922105f16270f92c012ef3092ea5ead2004d94b589d
+  metadata.gz: 0adbd60dc4a40738080cda3e7dc46f9860a14b2be6c17b8cdf0b2e58663b3519ccdc044c7239b0695ac0ddb5cbb22b691d57dc1342521c378cdad0abde728622
+  data.tar.gz: edf4321291b552a13de4aeac29c5b56d52e1e6823aa13423a6e6a1fd28816b2493747a781219c10ea53c3081c579d6b4ca00cb1eab9fdf0c446869ea930ba854

data/lib/kbsecret/cli/command/commands.rb

@@ -27,9 +27,9 @@ module KBSecret
                    Command.internal_command_names
                  else
                    Command.all_command_names
-                 end
+                 end.join "\n"
 
-          puts cmds.join "\n"
+          puts cmds unless cmds.empty?
         end
       end
     end

data/lib/kbsecret/config.rb

@@ -62,6 +62,27 @@ module KBSecret
       generators: DEFAULT_GENERATOR.dup,
     }.freeze
 
+    # Reads the user's configuration files from disk, introducing default values as necessary.
+    # @return [void]
+    # @api private
+    def self.load!
+      user_config = if File.exist?(CONFIG_FILE)
+                      YAML.load_file(CONFIG_FILE)
+                    else
+                      DEFAULT_CONFIG
+                    end
+
+      @command_config = if File.exist?(COMMAND_CONFIG_FILE)
+                          INIH.load(COMMAND_CONFIG_FILE)
+                        else
+                          {}
+                        end
+
+      @config = DEFAULT_CONFIG.merge(user_config)
+      @config[:sessions].merge!(DEFAULT_SESSION)
+      @config[:generators].merge!(DEFAULT_GENERATOR)
+    end
+
     # Writes the user's configuration to disk.
     # @return [void]
     def self.sync!
@@ -179,25 +200,10 @@ module KBSecret
       end
     end
 
-    user_config = if File.exist?(CONFIG_FILE)
-                    YAML.load_file(CONFIG_FILE)
-                  else
-                    DEFAULT_CONFIG
-                  end
-
-    @command_config = if File.exist?(COMMAND_CONFIG_FILE)
-                        INIH.load(COMMAND_CONFIG_FILE)
-                      else
-                        {}
-                      end
-
-    @config = DEFAULT_CONFIG.merge(user_config)
-    @config[:sessions].merge!(DEFAULT_SESSION)
-    @config[:generators].merge!(DEFAULT_GENERATOR)
-
     FileUtils.mkdir_p CONFIG_DIR
     FileUtils.mkdir_p CUSTOM_TYPES_DIR
 
+    load!
     sync!
   end
 end

data/lib/kbsecret/version.rb

@@ -2,5 +2,5 @@
 
 module KBSecret
   # kbsecret's current version
-  VERSION = "1.3.0.pre.3"
+  VERSION = "1.3.0.pre.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.3
+  version: 1.3.0.pre.4
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest