souffle 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+
+###  v0.0.1
+
+* Application framework laid out
+* Initial node state machine
+* Initial system state machine
+* Added AWS provider
+* Initial command line interface
+* Added daemonization
+* Added singleton configuration
+* Initial runlist parser
+* Initial dependency traversal
+* System rebalancing (pre-provisioning)
+* Added REST API
+
+### v0.0.2
+
+* AWS provider
+  * Added EBS support
+  * Added RAID support
+  * Added LVM Support
+* Added support for chef-solo provisioning
+* Switched from `Puma` to `Thin`
+* Updated REST API
+* Updated command line interface
+* Initial Documentation
+* Optimized AWS polling mechanism
+* Optimized AWS creation ordering
+
+### v0.0.3
+
+* Multiple documentation updates
+* AWS provider
+  * Tags now use `hex(4)` instead of `hex(6)`
+  * Deprecated default tag prefix
+* Added chef roles support to providers
+* Fixed /version url link
+* Added `tag`, `domain`, and `fqdn` node helpers
+* Bugfix for repo_path
+* Hostname is now set at provisioning

data/Gemfile

@@ -12,7 +12,6 @@ gem "em-synchrony", "~> 0.2.0"
 
 gem "right_aws", "~> 3.0.4"
 gem "tilt", "~> 1.3.3"
-gem "redis", "~> 3.0.1"
 
 gem "mixlib-cli", ">= 1.2.2"
 gem "mixlib-config", ">= 1.1.0"

data/README.md

@@ -1,6 +1,212 @@
 # souffle
 
-An orchestrator for setting up isolated chef-managed systems.
+An orchestrator for describing and building entire systems with [Chef](https://github.com/opscode/chef).
+
+Currently we only support `AWS`, however we intend to add support for `Vagrant` and `Rackspace` quite soon.
+
+## Setup
+
+Example configuration file (/etc/souffle/souffle.rb):
+
+```ruby
+rack_environment "production"
+
+aws_access_key "160147B34F7DCE679A6B"
+aws_access_secret "e01a4cb196b092ca8e93a5e66837bb194e86a9b1"
+aws_region "us-west-2"
+aws_image_id "ami-1d75574f"
+aws_instance_type "c1.medium"
+key_name "josh"
+```
+
+## CLI
+
+The `souffle` command line client can either be run standalone (with a single json provision) or as a webserver.
+Running the service as a daemon automatically starts the webserver.
+
+    Usage: souffle (options)
+        -c, --config CONFIG              The configuration file to use
+        -d, --daemonize                  Run the application as a daemon (forces `-s`)
+        -E, --environment                The environment profile to use
+        -g, --group GROUP                Group to set privilege to
+        -j, --json JSON                  The json for a single provision (negates `-s`)
+        -l, --log_level LEVEL            Set the log level (debug, info, warn, error, fatal)
+        -L, --logfile LOG_LOCATION       Set the log file location, defaults to STDOUT
+        -f, --pid PID_FILE               Set the PID file location, defaults to /tmp/souffle.pid
+        -p, --provider PROVIDER          The provider to use (overrides config)
+        -H, --hostname HOSTNAME          Hostname to listen on (default: 0.0.0.0)
+        -P, --port PORT                  Port to listen on (default: 8080)
+        -s, --server                     Start the application as a server
+        -u, --user USER                  User to set privilege to
+        -V, --vagrant_dir VAGRANT_DIR    The path to the base vagrant vm directory
+        -v, --version                    Show souffle version
+        -h, --help                       Show this message
+
+## Defining a system
+
+As an example system we'll generate two nodes that both are provisioned with `solo`, have 2 10GB `raid0` EBS drives attached and configured with `LVM`.
+
+```json
+{
+  "provider": "aws",
+  "user": "josh",
+  "options": {
+    "domain": "mydomain.com",
+    "type": "solo",
+    "aws_ebs_size": 10,
+    "volume_count": 2
+  },
+  "nodes": [
+    {
+      "name": "example_repo",
+      "options": {
+        "attributes": {
+          "nginx": { "example_attribute": "blehk" }
+        },
+        "run_list": [ "role[nginx_server]" ]
+      }
+    },
+    {
+      "name": "example_srv",
+      "options": {
+        "attributes": {
+          "gem": { "source": "http://gem.mydomain.com" }
+        }
+      },
+      "run_list": [ "recipe[yum]", "recipe[gem]", "recipe[git]" ],
+      "dependencies": [ "role[nginx_server]" ]
+    }
+  ]
+}
+```
+
+### Attributes
+
+Attributes work in a specific-wins merge for the json configuration. If you define a `configuration option`, it's applied unless a `system` level option overrides that, which is in tern applied unless a `node` level option overrides that.
+
+This should be a familiar concept to those of who are using [Chef](https://github.com/opscode/chef). Similar to `environments`, `roles`, and `nodes`.
+
+#### Example
+
+```json
+{
+  "options": {
+    "aws_ebs_size": 10,
+    "volume_count": 2
+  },
+  "nodes": [
+    {
+      "name": "is_overriden",
+      "options": {
+        "aws_ebs_size":20,
+        "volume_count": 4
+      }
+    },
+    {
+      "name": "not_overridden"
+    },
+    {
+      "name": "count_overridden",
+      "options": {
+        "volume_count": 6
+      }
+    },
+    {
+      "name": "ebs_overridden",
+      "options": {
+        "aws_ebs_size": 50
+      }
+    }
+  ]
+}
+```
+
+With the above system, we'll have four nodes and the default system-wide options:
+
+<table>
+  <tr>
+    <th>Name</th><th>aws_ebs_size</th><th>volume_count</th>
+  </tr>
+  <tr>
+    <td>system (default)</td>
+    <td>10</td>
+    <td>2</td>
+  </tr>
+  <tr>
+    <td>is_overridden</td>
+    <td>20</td>
+    <td>4</td>
+  </tr>
+  <tr>
+    <td>not_overridden</td>
+    <td>10</td>
+    <td>2</td>
+  </tr>
+  <tr>
+    <td>count_overridden</td>
+    <td>10</td>
+    <td>6</td>
+  </tr>
+  <tr>
+    <td>ebs_overridden</td>
+    <td>50</td>
+    <td>2</td>
+  </tr>
+</table>
+
+#### Options
+
+    **Special Cases**
+    The `:attributes` key is representative of node-specific Chef attributes.
+
+
+The options hash is used to represent provisioner-level options (AWS, Vagrant) with the exception of the attributes key.
+
+## REST Interface
+
+You can start up the rest interface by starting `souffle` with the `-d` parameter. We do not currently have a web ui, however the webserver supports the following actions: `create`, `version`, `status`. The default path `/` returns the `version`.
+
+<table>
+  <tr>
+    <th>Command</th><th>Url</th><th>Example</th>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>/, /version</td>
+    <td>curl -sL http://localhost:8080/</td>
+  </tr>
+  <tr>
+    <td>create</td>
+    <td>/create</td>
+    <td>curl -sL http://localhost:8080/create</td>
+  </tr>
+  <tr>
+    <td>status (all)</td>
+    <td>/status</td>
+    <td>curl -sL http://localhost:8080/status</td>
+  </tr>
+  <tr>
+    <td>status (specific)</td>
+    <td>/status/<code>system</code></td>
+    <td>curl -sL http://localhost:8080/status/<code>6cbb78b2925a</code></td>
+  </tr>
+</table>
+
+### Creating a new system
+
+There are two ways to create a new system, you can either create it with the `souffle` cli, or you can use the rest interface.
+
+Both the cli and the rest interface use the standard `json` format for [defining systems](#defining-a-system).
+
+    # Running from the CLI
+    souffle -j /path/to/system.json
+
+    # Using cURL/HTTP
+    curl -H "Content-Type: application/json" -X PUT -T /path/to/system.json http://localhost:8080/create
+
+### Status
+
+The `status` is returned in full `json` dump of the current system status.
 
 ## A note on tests
 
@@ -8,6 +214,8 @@ In order to avoid painfully silly charges and costs, all of the AWS tests
 that require you to pay (spinning up machines, etc), will only run if you
 have the environment variable `AWS_LIVE` set to `true`.
 
+    AWS_LIVE=true rake
+
 ## Contributing to souffle
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "souffle"
   gem.homepage = "http://github.com/seryl/souffle"
   gem.license = "MIT"
-  gem.summary = %Q{An orchestrator to create entire chef environments}
-  gem.description = %Q{An orchestrator to create entire chef environments}
+  gem.summary = %Q{An orchestrator for describing and building entire systems with Chef}
+  gem.description = %Q{An orchestrator for describing and building entire systems with Chef}
   gem.email = "joshtoft@gmail.com"
   gem.authors = ["Josh Toft"]
   gem.version = Souffle::VERSION

data/lib/souffle/config.rb

@@ -75,8 +75,11 @@ class Souffle::Config
 
   # Chef Settings
   chef_cookbook_path []
+  chef_role_path []
   chef_provisioner :solo
-  chef_domain "souffle"
+
+  # Domain
+  domain "souffle"
 
   # Provider Settings
   provider "Vagrant"

data/lib/souffle/http.rb

@@ -7,9 +7,11 @@ class Souffle::Http < Sinatra::Base
   before { content_type :json }
 
   # Returns the current version of souffle.
-  get '/' do
-    { :name => 'souffle',
-      :version => Souffle::VERSION }.to_json
+  ['/', '/version'].each do |path|
+    get path do
+      { :name => 'souffle',
+        :version => Souffle::VERSION }.to_json
+    end
   end
 
   # Returns the current status of souffle.
@@ -36,8 +38,13 @@ class Souffle::Http < Sinatra::Base
     provider = Souffle::Provider::AWS.new
 
     system = Souffle::System.from_hash(data)
-    provider.create_system(system)
+    system_tag = provider.create_system(system)
 
-    { :success => true }.to_json
+    begin
+      { :success => true, :system => system_tag }.to_json
+    rescue Exception => e
+      Souffle::Log.error "#{e.message}:\n#{e.backtrace.join("\n")}"
+      { :success => false }.to_json
+    end
   end
 end

data/lib/souffle/node/runlist.rb

@@ -19,4 +19,11 @@ class Souffle::Node::RunList < Array
     super(item)
   end
 
+  # Returns the description of a run_list in hash format.
+  # 
+  # @return [ Hash ] The description of a run_list in hash format.
+  def to_hash
+    map.each { |item| item.to_s }
+  end
+
 end

data/lib/souffle/node.rb

@@ -103,6 +103,40 @@ class Souffle::Node
   # 
   # @return [ String ] The logging prefix for the given node.
   def log_prefix
-    "[#{try_opt(:tag)}: #{name}]"
+    "[#{tag}: #{name}]"
+  end
+
+  # The tag for the given node.
+  # 
+  # @return [ String ] The tag for the given node.
+  def tag
+    try_opt(:tag)
+  end
+
+  # The top-level domain name for the given node.
+  # 
+  # @return [ String ] The top-level domain name for the given node.
+  def domain
+    try_opt(:domain)
+  end
+
+  # The fully qualified domain name for the given node.
+  # 
+  # @return [ String ] The fully qualified domain name for the given node.
+  def fqdn
+    [name, tag, domain].compact.join('.')
+  end
+
+  # Returns the description of a node in hash format.
+  # 
+  # @return [ Hash ] The description of a node in hash format.
+  def to_hash
+    {
+      :name => @name,
+      :options => @options,
+      :provisioner => @provisioner,
+      :dependencies => @dependencies.to_hash,
+      :run_list => @run_list.to_hash
+    }
   end
 end

data/lib/souffle/provider/aws.rb

@@ -5,6 +5,12 @@ require 'souffle/polling_event'
 
 # Monkeypatch RightAws to support EBS delete on termination.
 class RightAws::Ec2
+  
+  # Modifies an EBS device delete on termination flag.
+  # 
+  # @param [ String ] instance_id The instance id to associate with the EBS.
+  # @param [ String ] device_name The name of the EBS device.
+  # @param [ Boolean ] delete_on_termination Whether or not to delete on term.
   def modify_block_device_delete_on_termination_attribute(instance_id,
       device_name, delete_on_termination)
     request_hash = {'InstanceId' => instance_id}
@@ -50,18 +56,25 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
   # @param [ String ] tag_prefix The tag prefix to use.
   # 
   # @return [ String ] The unique tag with prefix.
-  def generate_tag(tag_prefix="souffle")
-    "#{tag_prefix}-#{SecureRandom.hex(6)}"
+  def generate_tag(tag_prefix="sys")
+    if tag_prefix
+      "#{tag_prefix}-#{SecureRandom.hex(4)}"
+    else
+      SecureRandom.hex(4)
+    end
   end
 
   # Creates a system using aws as the provider.
   # 
   # @param [ Souffle::System ] system The system to instantiate.
   # @param [ String ] tag_prefix The tag prefix to use for the system.
-  def create_system(system, tag_prefix="souffle")
+  # 
+  # @return [ String ] The tag for the created system.
+  def create_system(system, tag_prefix=nil)
     system.options[:tag] = generate_tag(tag_prefix)
     system.provisioner = Souffle::Provisioner::System.new(system, self)
     system.provisioner.initialized
+    system.options[:tag]
   end
 
   # Takes a list of nodes and returns the list of their aws instance_ids.
@@ -158,7 +171,7 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
 
   # Wait for the machine to boot up.
   # 
-  # @parameter [ Souffle::Node ] The node to boot up.
+  # @param [ Souffle::Node ] node The node to boot up.
   def boot(node)
     wait_for_boot(node)
   end
@@ -465,6 +478,7 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
   # 
   # @todo Setup the chef/chef-solo tar gzip and ssh connections.
   def provision(node)
+    set_hostname(node)
     if node.try_opt(:chef_provisioner) == :solo
       provision_chef_solo(node, generate_chef_json(node))
     else
@@ -536,21 +550,35 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
     end
   end
 
+  # Sets the hostname for the given node for the chef run.
+  # 
+  # @param [ Souffle:Node ] node The node to update the hostname for.
+  def set_hostname(node)
+    local_lookup = "127.0.0.1       #{node.fqdn} #{node.name}\n"
+    fqdn = node.fqdn
+    ssh_block(node) do |ssh|
+      ssh.exec!("hostname '#{fqdn}'")
+      ssh.exec!("echo \"#{local_lookup}\" >> /etc/hosts")
+      ssh.exec!("echo \"HOSTNAME=#{fqdn}\" >> /etc/sysconfig/network")
+    end
+  end
+
   # Provisions a box using the chef_solo provisioner.
   # 
-  # @param [ String ] ipaddress The ip address of the node to provision.
+  # @param [ String ] node The node to provision.
   # @param [ String ] solo_json The chef solo json string to use.
   def provision_chef_solo(node, solo_json)
     rsync_file(node, @newest_cookbooks, "/tmp")
-    solo_config =  "node_name \"#{node.name}.souffle\"\n"
-    solo_config << 'cookbook_path "/tmp/cookbooks"'
+    solo_config =  "node_name \"#{node.fqdn}\"\n"
+    solo_config << "cookbook_path \"/tmp/cookbooks\"\n"
+    solo_config << 'role_path "/tmp/roles"'
     ssh_block(node) do |ssh|
       ssh.exec!("sleep 2; tar -zxf /tmp/cookbooks-latest.tar.gz -C /tmp")
       ssh.exec!("echo '#{solo_config}' >/tmp/solo.rb")
       ssh.exec!("echo '#{solo_json}' >/tmp/solo.json")
       ssh.exec!("chef-solo -c /tmp/solo.rb -j /tmp/solo.json")
-      rm_files =  "/tmp/cookbooks /tmp/cookbooks-latest.tar.gz"
-      rm_files << " /tmp/solo.rb /tmp/solo.json > /tmp/chef_bootstrap"
+      rm_files = %w{ /tmp/cookbooks /tmp/cookbooks-latest.tar.gz
+        /tmp/roles /tmp/solo.rb /tmp/solo.json /tmp/chef_bootstrap }
       ssh.exec!("rm -rf #{rm_files}")
     end
   end
@@ -567,8 +595,8 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
   # Rsync's a file to a remote node.
   # 
   # @param [ Souffle::Node ] node The node to connect to.
-  # @param [ Souffle::Node ] file The file to rsync.
-  # @param [ Souffle::Node ] path The remote path to rsync.
+  # @param [ String ] file The file to rsync.
+  # @param [ String ] path The remote path to rsync.
   def rsync_file(node, file, path='.')
     n = @ec2.describe_instances(node.options[:aws_instance_id]).first
     super(n[:private_ip_address], file, path)
@@ -656,8 +684,45 @@ class Souffle::Provider::AWS < Souffle::Provider::Base
   # 
   # @param [ String ] filesystem The filessytem you intend to use.
   # 
-  # @param [ String ] The filesystem formatter.
+  # @return [ String ] The filesystem formatter.
   def fs_formatter(filesystem)
     "mkfs.#{filesystem}"
   end
+
+  class << self
+    # Updates the souffle status with the latest AWS information.
+    # 
+    # @param [ RightAws::Ec2 ] ec2 The ec2 object to use for the status update.
+    def update_status(ec2=nil)
+      ec2 = get_base_ec2_info if ec2.nil?
+      return if ec2.nil?
+
+      ec2.describe_instances(
+          :filters => { 'tag-key' => "souffle" }).each do |instance|
+        instance[:tags]["souffle"]
+        # TODO: ADD Status update.
+      end
+    end
+
+    # Returns the base (configured) ec2 object for status updates.
+    # 
+    # @return [ RightAws::Ec2 ] The base RightAws Ec2 object.
+    def get_base_ec2_info
+      access_key = Souffle::Config[:aws_access_key]
+      access_secret = Souffle::Config[:aws_access_secret]
+      aws_region = Souffle::Config[:aws_region]
+
+      if Souffle::Config[:debug]
+        logger = Souffle::Log.logger
+      else
+        logger = Logger.new('/dev/null')
+      end
+
+      RightAws::Ec2.new(access_key, access_secret,
+        :region => aws_region, :logger => logger)
+    rescue
+      nil
+    end
+  end
+
 end

data/lib/souffle/provider.rb

@@ -23,7 +23,7 @@ module Souffle::Provider
     end
 
     # Wait until ssh is available for the node and then connect.
-    def boot(node, retries=50)
+    def boot(node)
     end
 
     # Creates a system for a given provider. Intended to be overridden.
@@ -33,7 +33,7 @@ module Souffle::Provider
     # 
     # @param [ Souffle::System ] system The system to instantiate.
     # @param [ String ] tag The tag to use for the system.
-    def create_system(system, tag="souffle")
+    def create_system(system, tag=nil)
       error_msg = "#{self.class.to_s}: you must override create_system"
       raise Souffle::Exceptions::Provider, error_msg
     end
@@ -63,7 +63,7 @@ module Souffle::Provider
     # @return [ String ] The chef-solo json for the particular node.
     def generate_chef_json(node)
       json_info = Hash.new
-      json_info[:domain] = "souffle"
+      json_info[:domain] = node.try_opt(:domain) || "souffle"
       json_info.merge!(node.options[:attributes])
       json_info[:run_list] = node.run_list
       JSON.pretty_generate(json_info)
@@ -200,6 +200,18 @@ module Souffle::Provider
       end
     end
 
+    # The list of roles and their full paths.
+    # 
+    # @return [ Array ] The list of roles and their full paths.
+    def role_paths
+      Array(Souffle::Config[:chef_role_path]).inject([]) do |_paths, path|
+        Dir.glob("#{File.expand_path(path)}/*").each do |role|
+          _paths << role if role[-3..-1].eql?(".rb")
+        end
+        _paths
+      end
+    end
+
     # Creates a new cookbook tarball for the deployment.
     # 
     # @return [ String ] The path to the created tarball.
@@ -207,15 +219,19 @@ module Souffle::Provider
       tarball_name = "cookbooks-latest.tar.gz"
       temp_dir = File.join(Dir.tmpdir, "chef-cookbooks-latest")
       temp_cookbook_dir = File.join(temp_dir, "cookbooks")
+      temp_roles_dir = File.join(temp_dir, "roles")
       tarball_dir = "#{File.dirname(Souffle::Config[:config_file])}/tarballs"
       tarball_path = File.join(tarball_dir, tarball_name)
 
       FileUtils.mkdir_p(tarball_dir) unless File.exists?(tarball_dir)
       FileUtils.mkdir_p(temp_dir) unless File.exists?(temp_dir)
       FileUtils.mkdir(temp_cookbook_dir) unless File.exists?(temp_cookbook_dir)
+      FileUtils.mkdir(temp_roles_dir) unless File.exists?(temp_roles_dir)
       cookbook_paths.each { |pkg| FileUtils.cp_r(pkg, temp_cookbook_dir) }
+      role_paths.each { |role| FileUtils.cp(role, temp_roles_dir) }
 
-      tar_command =  "tar -C #{temp_dir} -czf #{tarball_path} ./cookbooks"
+      tar_command =  "tar -C #{temp_dir} -czf #{tarball_path} "
+      tar_command << "./cookbooks ./roles"
       if EM.reactor_running?
         EM::DeferrableChildProcess.open(tar_command) do
           FileUtils.rm_rf temp_dir
@@ -226,6 +242,12 @@ module Souffle::Provider
       end
       tarball_path
     end
+
+    class << self
+      # Updates the souffle status with the latest provider information.
+      def update_status; end
+    end
+
   end
 end
 

data/lib/souffle/state.rb

@@ -1,16 +1,11 @@
-require 'souffle/redis_client'
+require 'mixlib/config'
 
+# The singleton state object for the souffle server.
 class Souffle::State
-  class << self
+  extend Mixlib::Config
 
-    # The Souffle::State prefix for Redis.
-    def prefix
-      "souffle_state_"
-    end
-
-    # Returns the current system states.
-    def status
-      Souffle::Redis.get("#{Souffle::State.prefix}status")
-    end
+  # Return the configuration itself upon inspection.
+  def self.inspect
+    configuration.inspect
   end
 end

data/lib/souffle/system.rb

@@ -114,6 +114,16 @@ class Souffle::System
     nil
   end
 
+  # Returns the description of a system in hash format.
+  # 
+  # @return [ Hash ] The description of a system in hash format.
+  def to_hash
+    {
+      :nodes => @nodes.map { |n| n.to_hash },
+      :options => @options
+    }
+  end
+
   class << self
     # Creates a new system from a given hash.
     # 
@@ -123,6 +133,8 @@ class Souffle::System
       system_hash[:options] ||= {}
 
       sys = Souffle::System.new
+      sys.options = system_hash[:options]
+
       system_hash[:nodes].each do |n|
         n[:options] ||= Hash.new
         
@@ -130,7 +142,7 @@ class Souffle::System
         node.name = n[:name]
         Array(n[:run_list]).each { |rl| node.run_list << rl }
         Array(n[:dependencies]).each { |dep| node.dependencies << dep }
-        node.options = system_hash[:options].merge(n[:options])
+        node.options = n[:options]
         node.options[:attributes] ||= Hash.new
         sys.add(node)
       end

data/lib/souffle/version.rb

@@ -1,6 +1,6 @@
 # An orchestrator for setting up isolated chef-managed systems.
 module Souffle
   # The current souffle version.
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

data/lib/souffle.rb

@@ -10,6 +10,7 @@ require 'souffle/ssh_monkey'
 require 'souffle/log'
 require 'souffle/exceptions'
 require 'souffle/config'
+require 'souffle/state'
 require 'souffle/daemon'
 require 'souffle/node'
 require 'souffle/system'

data/spec/node/runlist_spec.rb

@@ -11,4 +11,14 @@ describe "Souffle::Node::RunList" do
     rl = Souffle::Node::RunList.new
     lambda { rl << "fsjklfds" }.should raise_error
   end
+
+  it "should be able to present itself in a hash format" do
+    rl = Souffle::Node::RunList.new
+    rl << "role[dns_server]"
+    rl << "recipe[chef_server::rubygems_install]"
+
+    rl_hash = [ "role[dns_server]", "recipe[chef_server::rubygems_install]" ]
+
+    rl.to_hash.should eql(rl_hash)
+  end
 end

data/spec/node_spec.rb

@@ -119,4 +119,24 @@ describe "Souffle::Node" do
     @node.try_opt(:example_passthru).should eql("blehk")
     Souffle::Config.configuration.delete(:example_passthru)
   end
+
+  it "should be able to create a hashed version of a node" do
+    node_hashed = {
+      :name => "testname",
+      :options => {
+        :attributes => {}
+      },
+      :provisioner => :solo,
+      :run_list => ["recipe[chef_server]", "recipe[blehk]"],
+      :dependencies => ["recipe[some_recipe]"]
+    }
+
+    @node.name = "testname"
+    @node.provisioner = :solo
+    @node.run_list << "recipe[chef_server]"
+    @node.run_list << "recipe[blehk]"
+    @node.dependencies << "recipe[some_recipe]"
+
+    @node.to_hash.should eql(node_hashed)
+  end
 end

data/spec/system_spec.rb

@@ -223,8 +223,7 @@ describe "Souffle::System" do
     parent = new_sys.nodes.select { |n| n.name == "parent_node" }.first
     parent.children.first.name.should eql("child_node")
     parent.options.should eql({ :attributes => {}, :type => "chef-solo" })
-    parent.children.first.options.should eql({
-      :attributes => {}, :type => "chef" })
+    parent.children.first.options.should eql({ :attributes => {} })
     
     new_sys.roots.size.should eql(2)
     new_sys.dependent_nodes.size.should eql(1)
@@ -261,4 +260,32 @@ describe "Souffle::System" do
     parent.run_list.should eql(masternode.run_list)
     parent.options.should eql(masternode.options)
   end
+
+  it "should be able to generate a system hash from a working system" do
+    sys = {
+      :options => { :type => "chef" },
+      :nodes => [
+        { :name => "parent_node",
+          :options => { :type => "chef-solo", :attributes => {} },
+          :run_list => ["role[somerole]"],
+          :dependencies => [],
+          :provisioner => nil },
+        { :name => "lone_node",
+          :options => { :attributes => {} },
+          :run_list => ["role[bestone]"],
+          :dependencies => [],
+          :provisioner => nil },
+        { :name => "child_node",
+          :options => { :attributes => {} },
+          :run_list => ["recipe[base]"],
+          :dependencies => ["role[somerole]"],
+          :provisioner => nil }
+      ]
+    }
+
+    new_sys = Souffle::System.from_hash(sys)
+    new_hash = new_sys.to_hash
+    new_hash[:options].should eql(sys[:options])
+    new_hash[:nodes].each { |n| sys[:nodes].include?(n).should eql(true) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souffle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -139,22 +139,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -379,7 +363,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: An orchestrator to create entire chef environments
+description: An orchestrator for describing and building entire systems with Chef
 email: joshtoft@gmail.com
 executables:
 - souffle
@@ -390,6 +374,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -417,8 +402,6 @@ files:
 - lib/souffle/provisioner.rb
 - lib/souffle/provisioner/node.rb
 - lib/souffle/provisioner/system.rb
-- lib/souffle/redis_client.rb
-- lib/souffle/redis_mixin.rb
 - lib/souffle/server.rb
 - lib/souffle/ssh_monkey.rb
 - lib/souffle/state.rb
@@ -465,6 +448,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: An orchestrator to create entire chef environments
+summary: An orchestrator for describing and building entire systems with Chef
 test_files: []
 has_rdoc: 

data/lib/souffle/redis_client.rb

@@ -1,8 +0,0 @@
-require 'souffle/redis_mixin'
-
-class Souffle::Redis
-  extend Souffle::RedisMixin
-
-  # Force initialization of the redis client (@redis).
-  init
-end

data/lib/souffle/redis_mixin.rb

@@ -1,40 +0,0 @@
-require 'eventmachine'
-require 'redis'
-
-# A singleton mixin adapter similar to mixlib/log.
-# 
-# @example
-# 
-#   require 'souffle/redis_mixin'
-# 
-#   class MyRedis
-#     extend Souffle::RedisMixin
-#   end
-# 
-#   MyRedis.set('awesome', 'cool')
-#   MyRedis.get('awesome')
-# 
-module Souffle::RedisMixin
-  attr_reader :redis
-
-  # Initializes the redis client (uses synchrony if Eventmachine is running).
-  def init(*opts)
-    if EM.reactor_running?
-      @redis ||= Redis.new({ :driver => :synchrony }.merge(*opts))
-    else
-      @redis ||= Redis.new(*opts)
-    end
-  end
-
-  # The singleton redis object, initializes if it doesn't exist.
-  def redis
-    @redis || init
-  end
-
-  # Pass any other method calls to the underlying redis object created with
-  # init. If this method is hit before the call to Souffle::RedisMixin.init
-  # has been made, it will call Souffle::RedisMixin.init() with no arguments.
-  def method_missing(method_symbol, *args, &blk)
-    redis.send(method_symbol, *args, &blk)
-  end
-end