spiceweasel 2.3.1 → 2.4.0

data/lib/spiceweasel/berksfile.rb

@@ -48,6 +48,7 @@ module Spiceweasel
       create_command("berks upload #{berks_options}")
       Berkshelf.ui.mute do
         Spiceweasel::Log.debug("berkshelf resolving dependencies: #{resolve_opts}")
+        # berks.resolve(resolve_opts) blows up with Berkshelf 2.0
         berks.resolve(resolve_opts).each do |cb|
           @cookbook_list[cb.cookbook_name] = cb.version
           delete_command("knife cookbook#{Spiceweasel::Config[:knife_options]} delete #{cb.cookbook_name} #{cb.version} -a -y")

data/lib/spiceweasel/cli.rb

@@ -29,6 +29,7 @@ require 'spiceweasel/roles'
 require 'spiceweasel/data_bags'
 require 'spiceweasel/nodes'
 require 'spiceweasel/clusters'
+require 'spiceweasel/knife'
 require 'spiceweasel/extract_local'
 require 'spiceweasel/execute'
 
@@ -290,8 +291,9 @@ module Spiceweasel
       data_bags = DataBags.new(manifest['data bags'])
       nodes = Nodes.new(manifest['nodes'], cookbooks, environments, roles)
       clusters = Clusters.new(manifest['clusters'], cookbooks, environments, roles)
+      knife = Knife.new(manifest['knife'])
 
-      create += environments.create + roles.create + data_bags.create + nodes.create + clusters.create
+      create += environments.create + roles.create + data_bags.create + nodes.create + clusters.create + knife.create
       delete += environments.delete + roles.delete + data_bags.delete + nodes.delete + clusters.delete
       return create, delete
     end

data/lib/spiceweasel/knife.rb

@@ -0,0 +1,59 @@
+#
+# Author:: Matt Ray (<matt@opscode.com>)
+#
+# Copyright:: 2013, Opscode, Inc <legal@opscode.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'mixlib/shellout'
+
+module Spiceweasel
+  class Knife
+
+    include CommandHelper
+
+    attr_reader :knife_list, :create
+
+    def initialize(knives = {})
+      @create = Array.new
+      if knives
+        allknifes = Mixlib::ShellOut.new('knife -h').run_command.stdout.split(/\n/)
+        allknifes.keep_if {|x| x.start_with?('knife')}
+        Spiceweasel::Log.debug(allknifes)
+        knives.each do |knife|
+          Spiceweasel::Log.debug("knife: #{knife}")
+          knife.keys.each do |knf|
+            validate(knf, allknifes) unless Spiceweasel::Config[:novalidation]
+            if knife[knf]
+              knife[knf].each do |options|
+                create_command("knife #{knf} #{options}")
+              end
+            else
+              create_command("knife #{knf}")
+            end
+          end
+        end
+      end
+    end
+
+    # test that the knife command exists
+    def validate(command, allknifes)
+      unless allknifes.index {|x| x.start_with?("knife #{command}")}
+        STDERR.puts "ERROR: 'knife #{command}' is not a currently supported command for knife."
+        exit(-1)
+      end
+    end
+
+  end
+end

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/spec/bin/joyent-vsphere_spec.rb

@@ -1,5 +1,5 @@
 # Test new 2.3 functionality
-describe 'The Spiceweasel binary' do
+describe 'testing 2.3 functionality' do
   before(:each) do
     @expected_output = <<-OUTPUT
 knife cookbook delete apache2  -a -y

data/spec/bin/knife_spec.rb

@@ -0,0 +1,18 @@
+# Test new 2.4 functionality
+describe 'testing knife commands' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife node list
+knife client list
+knife ssh "role:database" "chef-client" -x root
+knife ssh "role:webserver" "sudo chef-client" -x ubuntu
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test knife commands from 2.4" do
+    `#{@spiceweasel_binary} examples/knife.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/spiceweasel_spec.rb

@@ -51,6 +51,11 @@ knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-8
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -E amazon -r 'role[webserver],recipe[mysql::client]'
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -E amazon -r 'role[webserver],recipe[mysql::client]'
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -E amazon -r 'role[webserver],recipe[mysql::client]'
+knife ssh 'role:monitoring' 'sudo chef-client' -x user
+knife rackspace server delete -y --node-name db3 --purge
+knife vsphere vm clone --bootstrap --template 'abc' my-new-webserver1
+knife vsphere vm clone --bootstrap --template 'def' my-new-webserver2
+knife vsphere vm clone --bootstrap --template 'ghi' my-new-webserver3
     OUTPUT
 
     @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -178,12 +178,14 @@ files:
 - lib/spiceweasel/environments.rb
 - lib/spiceweasel/execute.rb
 - lib/spiceweasel/extract_local.rb
+- lib/spiceweasel/knife.rb
 - lib/spiceweasel/log.rb
 - lib/spiceweasel/nodes.rb
 - lib/spiceweasel/roles.rb
 - lib/spiceweasel/version.rb
 - lib/spiceweasel.rb
 - spec/bin/joyent-vsphere_spec.rb
+- spec/bin/knife_spec.rb
 - spec/bin/spiceweasel_spec.rb
 homepage: https://github.com/mattray/spiceweasel
 licenses:
@@ -212,4 +214,5 @@ specification_version: 3
 summary: CLI for generating Chef knife commands from a simple JSON or YAML file.
 test_files:
 - spec/bin/joyent-vsphere_spec.rb
+- spec/bin/knife_spec.rb
 - spec/bin/spiceweasel_spec.rb