spiceweasel 0.4 → 0.5

data/README.md

@@ -1,12 +1,12 @@
 Description
 ===========
-Spiceweasel is a command-line tool for batch loading Chef infrastructure. It provides a simple syntax for describing and deploying infrastructure in order with the Chef command-line tool `knife`.
+Spiceweasel is a command-line tool for batch loading Chef infrastructure. It provides a simple syntax in either JSON or YAML for describing and deploying infrastructure in order with the Chef command-line tool `knife`.
 
 CHANGELOG.md covers current, previous and future development milestones and contains the features backlog.
 
 Requirements
 ============
-Spiceweasel currently depends on `knife` to run commands for it.
+Spiceweasel currently depends on `knife` to run commands for it. Infrastructure files must either end in .json or .yml to be processed.
 
 Written with Chef 0.9.12 and 0.9.14 and supports cookbooks, recipes, roles, data bags and nodes. Support for environments will be added with the Chef 0.10 release.
 
@@ -16,7 +16,66 @@ Tested with Ubuntu 10.04 and 10.10 and Chef 0.9.12 and 0.9.14.
 
 File Syntax
 ===========
-The syntax for the spiceweasel file is a simple YAML format of Chef primitives describing what is to be instantiated. 
+The syntax for the spiceweasel file may be either JSON or YAML format of Chef primitives describing what is to be instantiated. Below or 2 examples describing the same infrastructure.
+
+JSON
+----
+From the `example.json`:
+
+    {
+        "cookbooks":
+        [
+            {"apache2":[]},
+            {"apt":
+             [
+                 "1.1.0"
+             ]
+            },
+            {"mysql":[]}
+        ],
+        "roles":
+        [
+            {"base":[]},
+            {"monitoring":[]},
+            {"webserver":[]}
+        ],
+        "data bags":
+        [
+            {"users":
+             [
+                 "alice",
+                 "bob",
+                 "chuck"
+             ]
+            },
+            {"data":[]}
+        ],
+        "nodes":
+        [
+            {"serverA":
+             [
+                 "role[base]",
+                 "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems"
+             ]
+            },
+            {"ec2 5":
+             [
+                 "role[webserver] recipe[mysql::client]",
+                 "-S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small"
+             ]
+            },
+            {"rackspace 3":
+             [
+                 "recipe[mysql] role[monitoring]",
+                 "--image 49 --flavor 2"
+             ]
+            }
+        ]
+    }
+
+YAML
+----
+From the `example.yml`:
 
     cookbooks:
     - apache2:
@@ -49,7 +108,7 @@ The syntax for the spiceweasel file is a simple YAML format of Chef primitives d
 
 Cookbooks
 ---------
-The `cookbooks` section of the YAML file currently supports `knife cookbook upload FOO` where `FOO` is the name of the cookbook in the `cookbooks` directory. If a version is passed, it is validated against an existing cookbook `metadata.rb` and if none is found, the missing cookbook is downloaded. The YAML snippet
+The `cookbooks` section of the JSON or YAML file currently supports `knife cookbook upload FOO` where `FOO` is the name of the cookbook in the `cookbooks` directory. If a version is passed, it is validated against an existing cookbook `metadata.rb` and if none is found, the missing cookbook is downloaded.  The YAML snippet
 
     cookbooks:
     - apache2:
@@ -66,7 +125,7 @@ produces the knife commands
 
 Roles
 -----
-The `roles` section of the YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The YAML snippet 
+The `roles` section of the JSON or YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The YAML snippet 
 
     roles:
     - base:
@@ -81,7 +140,7 @@ produces the knife commands
 
 Data Bags
 ---------
-The `data bags` section of the YAML file currently creates the data bags listed with `knife data bag create FOO` where `FOO` is the name of the data bag. Individual items may be added to the data bag as part of a YAML sequence, the assumption is made that they `.json` files and in the `data_bags` directory. The YAML snippet 
+The `data bags` section of the JSON or YAML file currently creates the data bags listed with `knife data bag create FOO` where `FOO` is the name of the data bag. Individual items may be added to the data bag as part of a JSON or YAML sequence, the assumption is made that they `.json` files and in the `data_bags` directory. The YAML snippet 
 
     data bags:
     - users:
@@ -100,7 +159,7 @@ produces the knife commands
 
 Nodes
 -----
-The `nodes` section of the YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a YAML sequence. The first item is the run_list and the second the CLI options used. Validation is performed on the run_list components to ensure that only recipes and roles listed in the YAML file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet 
+The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet 
 
     nodes:
     - serverA:
@@ -129,9 +188,13 @@ Usage
 =====
 To run a spiceweasel file, run the following from you Chef repository directory:
 
+    spiceweasel path/to/infrastructure.json
+
+or
+
     spiceweasel path/to/infrastructure.yml
 
-This will generate the knife commands to build the described infrastructure. 
+This will generate the knife commands to build the described infrastructure. Infrastructure files must end in either `.json` or `.yml`.
 
 --dryrun
 --------
@@ -139,7 +202,7 @@ This is the default action, printing the knife commands to be run without execut
 
 -d/--delete
 -----------
-The delete command will generate the knife commands to delete the infrastructure described in the YAML file. This includes each cookbook, role, data bag, environment and node listed. Currently all nodes from the system are deleted with `knife node bulk_delete`, specific-node support will be added in a future release.
+The delete command will generate the knife commands to delete the infrastructure described in the file. This includes each cookbook, role, data bag, environment and node listed. Currently all nodes from the system are deleted with `knife node bulk_delete`, specific-node support will be added in a future release.
 
 -h/--help
 ---------
@@ -147,7 +210,7 @@ Print the currently-supported usage options for spiceweasel.
 
 -r/--rebuild
 ---------
-The rebuild command will generate the knife commands to delete and recreate the infrastructure described in the YAML file. This includes each cookbook, role, data bag, environment and node listed. Currently all nodes from the system are deleted with `knife node bulk_delete`, specific-node support will be added in a future release.
+The rebuild command will generate the knife commands to delete and recreate the infrastructure described in the file. This includes each cookbook, role, data bag, environment and node listed. Currently all nodes from the system are deleted with `knife node bulk_delete`, specific-node support will be added in a future release.
 
 -v/--version
 ------------

data/bin/spiceweasel

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'json'
 require 'mixlib/cli'
-require 'yaml'
 require 'spiceweasel/version'
+require 'yaml'
 
 #ensure that the run_list contents are present in either the cookbooks or roles
 def validate_run_list(run_list, cookbooks, roles)
@@ -81,9 +82,17 @@ rescue OptionParser::InvalidOption => e
 end
 
 begin
-  yml = YAML.load_file ARGV.last
+  file = ARGV.last
+  if (file.end_with?(".yml"))
+    input = YAML.load_file ARGV.last
+  elsif (file.end_with?(".json"))
+    input = JSON.parse(File.read(ARGV.last))
+  else
+    raise "Unknown file type, please use a file ending with either '.json' or '.yml'."
+    exit(-1)
+  end
 rescue Exception
-  STDERR.puts "No infrastructure YAML file provided."
+  STDERR.puts "No infrastructure .json or .yml file provided."
   puts cli.opt_parser.to_s
   exit(-1)
 end
@@ -92,7 +101,7 @@ create = String.new()
 delete = String.new()
 
 #cookbooks 
-cookbooks = yml['cookbooks'] || []
+cookbooks = input['cookbooks'] || []
 cookbook_list = []
 cookbooks.each do |cookbook|
   cb = cookbook.keys.first
@@ -119,7 +128,7 @@ cookbooks.each do |cookbook|
 end
 
 #roles 
-roles = yml['roles'] || []
+roles = input['roles'] || []
 role_list = []
 roles.each do |role|
   delete += "knife role delete #{role.keys[0]} -y\n"
@@ -129,7 +138,7 @@ roles.each do |role|
 end
 
 #data bags
-bags = yml['data bags'] || []
+bags = input['data bags'] || []
 bags.each do |bag|
   delete += "knife data bag delete #{bag.keys[0]} -y\n"
   create += "knife data bag create #{bag.keys[0]}\n"
@@ -139,7 +148,7 @@ bags.each do |bag|
   end
 end
 
-nodes = yml['nodes'] || []
+nodes = input['nodes'] || []
 #currently use bulk_delete for deleting, add provider support real soon
 delete += "knife node bulk_delete .* -y\n"
 nodes.each do |node|

data/example.json

@@ -0,0 +1,50 @@
+{
+    "cookbooks":
+    [
+        {"apache2":[]},
+        {"apt":
+         [
+             "1.1.0"
+         ]
+        },
+        {"mysql":[]}
+    ],
+    "roles":
+    [
+        {"base":[]},
+        {"monitoring":[]},
+        {"webserver":[]}
+    ],
+    "data bags":
+    [
+        {"users":
+         [
+             "alice",
+             "bob",
+             "chuck"
+         ]
+        },
+        {"data":[]}
+    ],
+    "nodes":
+    [
+        {"serverA":
+         [
+             "role[base]",
+             "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems"
+         ]
+        },
+        {"ec2 5":
+         [
+             "role[webserver] recipe[mysql::client]",
+             "-S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small"
+         ]
+        },
+        {"rackspace 3":
+         [
+             "recipe[mysql] role[monitoring]",
+             "--image 49 --flavor 2"
+         ]
+        }
+    ]
+}

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spiceweasel
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Matt Ray
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -06:00
+date: 2011-03-14 00:00:00 -10:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - README.md
 - Rakefile
 - bin/spiceweasel
+- example.json
 - example.yml
 - lib/spiceweasel.rb
 - lib/spiceweasel/version.rb