knife-helper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78adf4c9784639e68738be65b5fbee92afda29b
-  data.tar.gz: fc00c910f235ff14e367ca59f06d357a4f8cec3b
+  metadata.gz: 14c6110622c4edde3584a337c98f75abcca3c97c
+  data.tar.gz: 5077e912b6578899015e76b6080a175ca96eec3b
 SHA512:
-  metadata.gz: 021e049241049d555172c8d497f11d8ce8e2f26d20b96d10cf8c30d89a467eace0957ef04d954dd68866949254afef30f8430f531df968e7e0f0586924befbf7
-  data.tar.gz: f5035e53a8c15a3bd03af4b5f8be69321cfa3b5643a26885b8f9b6a4439b30c1612ef5cd3fcf1d506ec611c32f99c1887fc7e19fa80c8c7afa1704dba0d7b3d2
+  metadata.gz: 591747610f3b6fce891af75ebc8aea0ccf12cd9f90e0a78b25935cd4401484b2f26fd9fe2929f55b7018fe224eda8694aee1772eee8c4a986541cc9d6ac257f4
+  data.tar.gz: 2260af1ce1998386913b6fe673f98acdc6b689991489f41dfb6c777ba67d0894d78e17b61ee95cdb55e4edbba6ba0f82e064c42348e58dc83e3b862c26ad4028

data/.travis.yml

@@ -12,4 +12,6 @@ matrix:
 script:
   - bundle exec rake
   - bundle exec knife helper init -B -L
+  - bundle exec knife helper list
+  - bundle exec knife helper build default
   - bundle exec knife helper exec default

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.5
+
+* Add `build` subcommand (Previously was `list`)
+* Change `list` subcommand to only listing
+
 ## 0.0.4
 
 * Add `list` subcommand [#4] ([@sawanoboly])

data/lib/chef/knife/helper_build.rb

@@ -0,0 +1,35 @@
+require 'chef'
+require 'knife/helper/commands'
+require 'knife/helper/config'
+
+class Chef
+  class Knife
+    class HelperBuild < Chef::Knife
+
+      banner "knife helper build REGEX (option)"
+
+      option :file,
+        :short => "-f FILE",
+        :long => "--file FILE",
+        :description => "Path to config file(yaml)",
+        :default => nil
+
+      def run
+        commands = ::Knife::Helper::Commands.new(
+          ::Knife::Helper::Config.new(config[:file]).data
+        )
+        unless @name_args.empty?
+          cm = commands.commands.select{|c| Regexp.new(@name_args.first).match(c['name']) }
+        else
+          cm = commands.commands
+        end
+        hash = {}
+        cm.map! do |c|
+          hash[c['name']] = c['command']
+        end
+        output(ui.presenter.format_for_display(hash))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/helper_exec.rb

@@ -19,28 +19,21 @@ class Chef
         :short => "-f FILE",
         :long => "--file FILE",
         :description => "Path to config file(yaml)",
-        :default => ""
+        :default => nil
 
       def run
-        file = config[:file] == "" ? default_config_file : config[:file]
         commands = ::Knife::Helper::Commands.new(
-          ::Knife::Helper::Config.new(file).data
+          ::Knife::Helper::Config.new(config[:file]).data
         )
         @name_args.each do |cmd|
           if config[:print_command]
-            puts commands.build(cmd)
+            output commands.build(cmd)
           else
             commands.exec(cmd)
           end
         end
       end
 
-      private
-
-      def default_config_file
-        ::File.join(Dir.pwd, ".knife.helper.yml")
-      end
-
     end
   end
 end

data/lib/chef/knife/helper_list.rb

@@ -6,35 +6,31 @@ class Chef
   class Knife
     class HelperList < Chef::Knife
 
-      banner "knife helper list REGEX (option)"
+      banner "knife helper list"
 
       option :file,
         :short => "-f FILE",
         :long => "--file FILE",
         :description => "Path to config file(yaml)",
-        :default => ""
+        :default => nil
+
+      option :all,
+        :short => "-a",
+        :long => "--all",
+        :description => "Print all commands and options",
+        :boolean => true,
+        :default => false
 
       def run
-        file = config[:file] == "" ? default_config_file : config[:file]
-        commands = ::Knife::Helper::Commands.new(
-          ::Knife::Helper::Config.new(file).data
-        )
-        unless @name_args.empty?
-          cm = commands.commands.select{|c| Regexp.new(@name_args.first).match(c['name']) }
-        else
-          cm = commands.commands
-        end
-        hash = {}
-        cm.map! do |c|
-          hash[c['name']] = c['command']
+        ::Knife::Helper::Commands.new(
+          ::Knife::Helper::Config.new(config[:file]).data
+        ).commands.each do |c|
+          if config[:all]
+            output(ui.presenter.format_for_display(c))
+          else
+            output c['name']
+          end
         end
-        output(ui.presenter.format_for_display(hash))
-      end
-
-      private
-
-      def default_config_file
-        ::File.join(Dir.pwd, ".knife.helper.yml")
       end
 
     end

data/lib/knife/helper/config.rb

@@ -8,7 +8,8 @@ module Knife
 
       attr_reader :data
 
-      def initialize(file)
+      def initialize(file=nil)
+        file ||= default_file
         @data = load_config(file)
       end
 
@@ -27,6 +28,10 @@ module Knife
         conf
       end
 
+      def default_file
+        ::File.join(Dir.pwd, ".knife.helper.yml")
+      end
+
       def read_file(file)
         ::File.exist?(file.to_s) ? IO.read(file) : ""
       end

data/lib/knife/helper/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Helper
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-helper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masashi Terui
@@ -110,6 +110,7 @@ files:
 - README.md
 - Rakefile
 - knife-helper.gemspec
+- lib/chef/knife/helper_build.rb
 - lib/chef/knife/helper_exec.rb
 - lib/chef/knife/helper_init.rb
 - lib/chef/knife/helper_list.rb