knife-whisk 1.0.0 → 2.0.0

data/README.markdown

@@ -14,6 +14,7 @@ Assume you've got knife-whisk installed and configured correctly and it's pointi
 ```
 mixins:
   defaults:
+  	provider: aws
     image: ami-950680fc      # ubuntu instance store
     subnet: subnet-12345678  # private subnet
     region: us-east-1
@@ -27,15 +28,21 @@ mixins:
   public_subnet:
     subnet: subnet-87654321
 
-security-groups:
-  default: sg-12345678
-  java_app_server: sg-34567890
-
+provider_config:
+  aws:
+    cli_command: "ec2 sever create"
+	security-groups:
+  	default: sg-12345678
+  	java_app_server: sg-34567890
+  kvm:
+    cli_command: "vm create"
+    
 servers:
   app_server:
     mixins:
     - defaults
     config:
+      provider: aws
       run-list:
       - "recipe[application-wrapper]"
       security-groups:
@@ -71,6 +78,8 @@ This is where knife-whisk shines. You don't have to be aware of all the ins and
 
 Most importantly, as a team you define what your production servers look like in your whisk.yml file and you'll never bring up a new node with a missing security group because you forgot some ancillary service was on the node that needed it.
 
+Security groups with VPC are a pain so we added a way to call them by name in your whisk.yml. knife-whisk will translate the `--security-groups name1,name2` to `--security-groups-ids id1,id2` according to what is in your "security-groups" lookup section.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -131,7 +140,7 @@ knife whisk generate application_server --mixins public_subnet
 ```
 
 ```
-knife whisk generate application_server --overrides "--environment=dev --node-name dev-application-server"
+knife whisk generate application_server --overrides "--environment dev --node-name dev-application-server"
 ```
 
 ## Tab Completion
@@ -140,9 +149,10 @@ knife whisk generate application_server --overrides "--environment=dev --node-na
 This repository also includes a zsh folder, with a replacement for oh-my-zsh's knife plugin.  Copy that to your ~/.oh-my-zsh/plugins/knife folder, and enabled the plugin by adding "knife" to your plugins=() in your .zshrc. You will likely need to reload your shell. 
 
 ## Todo
-* Support for non ec2 setups
+* supprot for --json-attributes knife flag
 * whisk add mixin
 * whisk add server
+* whisk provider list
 * bash tab completion
 
 ##Authors

data/examples/whisk.yml

@@ -1,5 +1,6 @@
 mixins:
   defaults:
+    provider: aws
     image: ami-950680fc      # ubuntu instance store
     subnet: subnet-12345678  # private subnet
     region: us-east-1        
@@ -8,22 +9,32 @@ mixins:
     ssh-user: ubuntu
     template: chef_full
     security-groups: default
+  aws:
+    provider: aws
   ebs:
     image: ami-e50e888c
   public_subnet:
     subnet: subnet-87654321
 
-security-groups:
-  default: sg-12345678
-  load_balancer: sg-23456789
-  java_app_server: sg-34567890
-  database_server: sg-45678901
+provider_config:
+  aws:
+    cli_command: "ec2 server create"
+    security-groups:
+      default: sg-12345678
+      load_balancer: sg-23456789
+      java_app_server: sg-34567890
+      database_server: sg-45678901
+  kvm:
+    cli_command: "vm create"
+  rackspace:
+    cli_command: "rackspace server create"
 
 servers:
   prod_nginx_load_balancer:
     mixins:
     - defaults
     - public_subnet
+    - aws
     config:
       run-list: 
       - "recipe[nginx]"
@@ -48,6 +59,7 @@ servers:
       - defaults
       - ebs
     config:
+      provider: rackspace
       run-list:
       - "recipe[postgres]"
       environment: prod

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

@@ -52,11 +52,11 @@ class Chef
       end
 
       def get_security_groups(groups)
-        groups.split(',').map! { |name| name.replace(get_config["security-groups"][name]) }.join(',')
+        groups.split(',').map! { |name| name.replace(get_config["provider_config"]["aws"]["security-groups"][name]) }.join(',')
       end
 
       def security_group_exists?(group) 
-        ! get_config["security-groups"][group].nil?
+        ! get_config["provider_config"]["aws"]["security-groups"][group].nil?
       end
 
       def mixin_exists?(mixin)
@@ -173,18 +173,29 @@ class Chef
         output_hash = output_hash.merge(@config[:overrides])
       end
       
-      #convert security-group names to ids if needed and make sure they exist in the lookup hash
-      unless output_hash["security-groups"].nil?
-        exit_with_message("security-groups not defined in whisk.yml") unless get_config["security-groups"]
-        output_hash["security-groups"].split(',').each { |group| exit_with_message("#{group} security group does not exist in whisk.yml") unless security_group_exists?(group)}
-        output_hash["security-group-ids"] = get_security_groups(output_hash["security-groups"])
-        output_hash.delete("security-groups")
+      #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
+        unless output_hash["security-groups"].nil?
+          exit_with_message("security-groups not defined for this config in whisk.yml") unless get_config["provider_config"]["aws"]["security-groups"]
+          output_hash["security-groups"].split(',').each { |group| exit_with_message("#{group} security group does not exist in whisk.yml") unless security_group_exists?(group)}
+          output_hash["security-group-ids"] = get_security_groups(output_hash["security-groups"])
+          output_hash.delete("security-groups")
+        end
       end
       
-      # run-list needs quotes for knife ec2 to accept the arg
+      #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?      
+
+      #get config string and check to make sure it exists
+      exit_with_message("provider attribute must be provided") unless output_hash["provider"]
+      exit_with_message("#{output_hash["provider"]} cli_command doesn't exist in whisk.yml") unless full_hash["provider_config"][output_hash["provider"]]["cli_command"]
+      cli_command = full_hash["provider_config"][output_hash["provider"]]["cli_command"]
+
+      output_hash.delete("provider")
 
-      printf "knife ec2 server create %s\n", output_hash.map { |key, value| ["--"+key, value] }.join(" ")
+      printf "knife %s %s\n", cli_command, output_hash.map { |key, value| ["--"+key, value] }.join(" ")
     end
   end
 end

data/lib/knife-whisk/version.rb

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

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: knife-whisk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Nic Grayson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A utility for quickly whipping up new servers in a team environment
@@ -45,25 +48,26 @@ files:
 - zsh/_knife
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Extends knife to display knife ec2 server create commands
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 14bd4c3ad621d14ee341d773ff75ad7afa5dacf1
-  data.tar.gz: b028449ba2113dc75b28262ebfec758692db58f7
-SHA512:
-  metadata.gz: 19dc6286ebf16222c7d5682f9b795492f29d3a677c987fa562bb66a00d98482e92ff31ca27e5c1b554a06e3ffac85d5b3709dfc11f297dfc8f1078693327c623
-  data.tar.gz: 3ad95946d5165a3926a8a0bdf0510e54005035142b68d2ef80a3d771a16331a3a848ff8273735d9a4394e9141d8af204bcc26350814ed8a73b399507a8e6cfc4