knife-whisk 2.0.0 → 2.0.1

data/README.markdown

@@ -30,10 +30,10 @@ mixins:
 
 provider_config:
   aws:
-    cli_command: "ec2 sever create"
-	security-groups:
-  	default: sg-12345678
-  	java_app_server: sg-34567890
+    cli_command: "ec2 server create"
+    security-groups:
+      default: sg-12345678
+      java_app_server: sg-34567890
   kvm:
     cli_command: "vm create"
     

data/knife-whisk.gemspec

@@ -8,13 +8,14 @@ Gem::Specification.new do |gem|
   gem.version       = Knife::Whisk::VERSION
   gem.authors       = ["Nic Grayson"]
   gem.email         = ["nic.grayson@banno.com"]
-  gem.summary       = %q{Extends knife to display knife ec2 server create commands}
+  gem.summary       = %q{Extends knife to display knife cloud server create commands}
   gem.description   = %q{A utility for quickly whipping up new servers in a team environment}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.add_dependency 'safe_yaml'
   gem.add_development_dependency 'chef'
   gem.require_paths = ["lib"]
 end

data/lib/chef/knife/knife-whisk.rb

@@ -1,5 +1,5 @@
 require 'chef/knife'
-require 'yaml'
+require 'safe_yaml'
 
 class Chef
   class Knife
@@ -12,13 +12,13 @@ class Chef
             :long => '--whisk-config PATH',
             :description => "Specify path to your whisk.yml file",
             :proc => Proc.new { |path| Chef::Config[:knife][:whisk_config_file] = path }
-          
+
           option :mixins,
             :short => '-M MIXINS',
             :long => '--mixins MIXINS',
             :description => "Overrides server mixins, takes comma seperated list of mixins",
             :proc => Proc.new { |input| input.split(",") }
-          
+
           option :overrides,
             :short => '-O STRING',
             :long => '--overrides STRING',
@@ -35,19 +35,19 @@ class Chef
       end
 
       def exit_with_message(message)
-        ui.fatal message 
-        Kernel.exit(1) 
+        ui.fatal message
+        Kernel.exit(1)
       end
-            
+
       def get_config
         if Chef::Config[:knife][:whisk_config_file].nil?
           if File.exists?(::Chef::Knife::chef_config_dir+"/whisk.yml")
-            YAML.load_file(::Chef::Knife::chef_config_dir+"/whisk.yml")
+            YAML.load_file(::Chef::Knife::chef_config_dir+"/whisk.yml", :safe => true)
           else
             return false
           end
         else
-          YAML.load_file(Chef::Config[:knife][:whisk_config_file])
+          YAML.load_file(Chef::Config[:knife][:whisk_config_file], :safe => true)
         end
       end
 
@@ -55,7 +55,7 @@ class Chef
         groups.split(',').map! { |name| name.replace(get_config["provider_config"]["aws"]["security-groups"][name]) }.join(',')
       end
 
-      def security_group_exists?(group) 
+      def security_group_exists?(group)
         ! get_config["provider_config"]["aws"]["security-groups"][group].nil?
       end
 
@@ -77,7 +77,7 @@ class Chef
   class WhiskServerList < Chef::Knife
     include Knife::WhiskBase
     banner "knife whisk server list"
-    
+
     def run
       exit_with_message("Required whisk.yml does not exist") unless get_config
       get_config["servers"].each do |server|
@@ -89,11 +89,11 @@ class Chef
   class WhiskServerShow < Chef::Knife
     include Knife::WhiskBase
     banner "knife whisk server show SERVER"
-    
+
     def run
       exit_with_message("Required whisk.yml does not exist") unless get_config
       exit_with_message("You must specify a server name") unless name_args.size == 1
-      
+
       if server_exists?(name_args.first)
         puts name_args.first
         puts get_config["servers"]["#{name_args.first}"].to_yaml
@@ -106,7 +106,7 @@ class Chef
   class WhiskMixinList < Chef::Knife
     include Knife::WhiskBase
     banner "knife whisk mixin list"
-    
+
     def run
       exit_with_message("Required whisk.yml does not exist") unless get_config
       get_config["mixins"].each do |mixin|
@@ -118,11 +118,11 @@ class Chef
   class WhiskMixinShow < Chef::Knife
     include Knife::WhiskBase
     banner "knife whisk mixin show MIXIN"
-    
+
     def run
       exit_with_message("Required whisk.yml does not exist") unless get_config
       exit_with_message("You must specify a mixin") unless name_args.size == 1
-      
+
       if mixin_exists?(name_args.first)
         puts name_args.first
         puts get_config["mixins"]["#{name_args.first}"].to_yaml
@@ -135,12 +135,12 @@ class Chef
   class WhiskGenerate < Chef::Knife
     include Knife::WhiskBase
     banner "knife whisk generate [SERVER]"
-    
+
     def run
       exit_with_message("Required whisk.yml does not exist") unless get_config
-      
+
       full_hash = get_config
-            
+
       if name_args.size == 0
         server_config = full_hash["mixins"]["defaults"]
         server_mixins = ["defaults"]
@@ -150,7 +150,7 @@ class Chef
       else
         exit_with_message("#{name_args.first} server template does not exist")
       end
-      
+
       unless @config[:mixins].nil?
         server_mixins = server_mixins + @config[:mixins]
       end
@@ -160,19 +160,19 @@ class Chef
 
       #merges together all mixin config values with server config values
       output_hash = server_mixins.inject(Hash.new) {|output, mixin| output.merge(full_hash["mixins"][mixin])}.merge(server_config)
-      
+
       #convert config values that are arrays to comma seperates strings
       output_hash.each do |mixin, value|
         if value.kind_of?(Array)
           output_hash[mixin] = value.join(",")
         end
       end
-      
+
       unless @config[:overrides].nil?
         exit_with_message("Please use long form flags only in overrides") unless @config[:overrides].kind_of?(Hash)
         output_hash = output_hash.merge(@config[:overrides])
       end
-      
+
       #check things for aws
       if output_hash["provider"]["aws"]
         #convert security-group names to ids if needed and make sure they exist in the lookup hash
@@ -183,10 +183,10 @@ class Chef
           output_hash.delete("security-groups")
         end
       end
-      
+
       #some values need quotes for knife ec2 to accept the arg
       output_hash["run-list"] = add_quotes(output_hash["run-list"]) unless output_hash["run-list"].nil?
-      # json doesn't work currently output_hash["json-attributes"] = add_quotes(output_hash["json-attributes"]) unless output_hash["json-attributes"].nil?      
+      # json doesn't work currently output_hash["json-attributes"] = add_quotes(output_hash["json-attributes"]) unless output_hash["json-attributes"].nil?
 
       #get config string and check to make sure it exists
       exit_with_message("provider attribute must be provided") unless output_hash["provider"]

data/lib/knife-whisk/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Whisk
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-whisk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -69,5 +85,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Extends knife to display knife ec2 server create commands
+summary: Extends knife to display knife cloud server create commands
 test_files: []