knife-helper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231c99b7f892f61e0999bcaaf5f7cbbf5d0c0662
-  data.tar.gz: 7bd5445511ca8634535b54934dd638e47f4e1e3c
+  metadata.gz: 3d4b237c333ed70fda38c3f29245fb32e47dbea4
+  data.tar.gz: 45615aad52e32b1b0c9753d649a757201663cbaa
 SHA512:
-  metadata.gz: c3f9bd07a71b9d90b691fbd7b407da1797b62653c4db8ffe8e44753cb1e2ab67697370dcc6396bbadd673d8521df5ba65ebc50af1cc312554a465fb01316ac7b
-  data.tar.gz: 4ba4ad52b24df0590506bc366d46995e623977df8c555e087b811e10ac9109236acf8a1d01f6f24a976ee22a151e6874a3e65d8d2303ae2974eebc887f750c1e
+  metadata.gz: af366ce80da28f92bc4672a2bddab83e8026a66ac33a76804c494f7ef65460f7918788a41c4c9e0eea543742d54e14a0e51d4a549b11fd0a76c00e1acdc88c3e
+  data.tar.gz: 7cfa50874c851e561ae5ea8506277f21f853b442322decb6af71ed4e57d8a7236aaacba51d371bb7ede3ad16a01677b6fdd393befc57cdc5f5d0b6e4436a47b5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1
+
+* Allow string to option_sets of commands
+
 ## 0.1.0
 
 * Support set of options [#1]

data/README.md

@@ -71,17 +71,22 @@ includes:
   - example.yml
 
 settings:
-  command_base: /home/marcy/.rbenv/versions/2.1.5/bin/knife
+  command_base: bundle exec knife
 
 option_sets:
   - name: default
     options:
+      ssh-user: ec2-user
+      identity-file: ~/.ssh/example.pem
+      hint: ec2
 
 commands:
   - name: default
-    command: help
-    condition:
+    command: zero chef_client
+    condition: chef_environment:production
+    option_sets: default
     options:
+      attribute: ec2.public_ipv4
 ```
 
 ### includes
@@ -108,6 +113,10 @@ Type: `String`
 Condition for search and execute command.  
 Type: `String`
 
+### commands:option_sets
+Option set to be used in the command.  
+Type: `String` or `Array`
+
 ### commands:options
 Command options.  
 Type: `Hash`

data/lib/knife/helper/commands.rb

@@ -21,6 +21,7 @@ module Knife
             cmd << " '#{c['condition']}'" if c.has_key?('condition') && c['condition']
             options = {}
             option_sets = {}
+            c['option_sets'] = Array(c['option_sets']) if c['option_sets'].is_a?(String)
             if c['option_sets'].is_a?(Array)
               c['option_sets'].each do |opts|
                 option_set(opts).each do |k,v|

data/lib/knife/helper/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Helper
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/knife/helper/commands_spec.rb

@@ -58,6 +58,13 @@ describe Knife::Helper::Commands do
             'attribute' => 'ipaddress'
           }
         },
+        {
+          'name' => 'knife-zero-opts-3',
+          'command' => 'zero chef_client',
+          'condition' => 'name:*',
+          'option_sets' => 'test_set02',
+          'options' => nil
+        },
         {
           'name' => 'help',
           'command' => 'help',
@@ -85,6 +92,10 @@ describe Knife::Helper::Commands do
       expect(@cmd.build('knife-zero-opts-2')).to eq(
         '/test/knife zero chef_client \'name:*\' -i ~/.ssh/knife-helper-example.pem -x ubuntu --sudo --attribute ipaddress')
     end
+    example do
+      expect(@cmd.build('knife-zero-opts-3')).to eq(
+        '/test/knife zero chef_client \'name:*\' -x ec2-user')
+    end
   end
 
   describe '#complete_option' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor