chef-workflow 0.1.1 → 0.2.0

data/lib/chef-workflow/support/vm/vagrant.rb

@@ -1,95 +1,111 @@
-require 'chef-workflow/support/vagrant'
-require 'chef-workflow/support/ip'
 require 'vagrant/prison'
 
-class VM
-  #
-  # Provisions a server group with vagrant and virtualbox.
-  #
-  # All vagrant machines share the same IP address on eth0, which is typically
-  # 10.0.2.15. To compensate for that, a host-only network address will be
-  # auto-generated for each server in the group and lives on eth1. It is strongly
-  # recommended that you deal with this problem in your chef cookbooks, as
-  # node["ipaddress"] will typically be wrong and we cannot compensate for it.
-  #
-  # Groups provisioned in this manner are done so with Vagrant::Prison.
-  #
-  class VagrantProvisioner
-    # Vagrant::Prison object
-    attr_reader :prison
-    # number of servers to provision
-    attr_reader :number_of_servers
-    # name of server group
-    attr_accessor :name
-
+module ChefWorkflow
+  class VM
     #
-    # Constructor. Expects a server group name and a number of servers to provision.
+    # Provisions a server group with vagrant and virtualbox.
     #
-    def initialize(name, number_of_servers)
-      @prison             = nil
-      @name               = name
-      @number_of_servers  = number_of_servers
-    end
-
+    # All vagrant machines share the same IP address on eth0, which is typically
+    # 10.0.2.15. To compensate for that, a host-only network address will be
+    # auto-generated for each server in the group and lives on eth1. It is strongly
+    # recommended that you deal with this problem in your chef cookbooks, as
+    # node["ipaddress"] will typically be wrong and we cannot compensate for it.
     #
-    # Get the ips associated with this server group.
+    # Groups provisioned in this manner are done so with Vagrant::Prison.
     #
-    def ips
-      IPSupport.singleton.get_role_ips(name)
-    end
+    class VagrantProvisioner
+      require 'chef-workflow/support/vagrant'
+      require 'chef-workflow/support/ip'
+      require 'chef-workflow/support/db/basic'
 
-    #
-    # Get the appropriate Vagrant UI class, depending on debugging settings.
-    #
-    def ui_class
-      $CHEF_WORKFLOW_DEBUG >= 2 ? Vagrant::UI::Basic : Vagrant::UI::Silent
-    end
+      # Vagrant::Prison object
+      attr_reader :prison
+      # number of servers to provision
+      attr_reader :number_of_servers
+      # name of server group
+      attr_accessor :name
 
-    #
-    # helper to bootstrap vagrant requirements.
-    #
-    def bootstrap_vagrant_ipsupport
-      IPSupport.singleton.seed_vagrant_ips
-    end
+      #
+      # Constructor. Expects a server group name and a number of servers to provision.
+      #
+      def initialize(name, number_of_servers)
+        @db                 = ChefWorkflow::DatabaseSupport::Object.new("vm_prisons")
+        @name               = name
+        @number_of_servers  = number_of_servers
+        @prison             = @db[name]
+      end
 
-    #
-    # Provision a group of servers. If successful, returns an array of the ips
-    # allocated for the group. Ignores incoming arguments.
-    #
-    def startup(*args)
-      bootstrap_vagrant_ipsupport
+      #
+      # Get the ips associated with this server group.
+      #
+      def ips
+        ChefWorkflow::IPSupport.get_role_ips(name)
+      end
+
+      #
+      # Get the appropriate Vagrant UI class, depending on debugging settings.
+      #
+      def ui_class
+        $CHEF_WORKFLOW_DEBUG >= 2 ? Vagrant::UI::Basic : Vagrant::UI::Silent
+      end
 
-      IPSupport.singleton.delete_role(name)
+      #
+      # helper to bootstrap vagrant requirements.
+      #
+      def bootstrap_vagrant_ipsupport
+        ChefWorkflow::IPSupport.seed_vagrant_ips
+      end
 
-      @prison = Vagrant::Prison.new(Dir.mktmpdir, false)
-      prison.name = name
-      prison.configure do |config|
-        config.vm.box_url = VagrantSupport.singleton.box_url
-        config.vm.box = VagrantSupport.singleton.box
-        number_of_servers.times do |x|
-          ip = IPSupport.singleton.unused_ip
-          IPSupport.singleton.assign_role_ip(name, ip)
-          config.vm.define "#{name}-#{x}" do |this_config|
-            this_config.vm.network :hostonly, ip
+      #
+      # Provision a group of servers. If successful, returns an array of the ips
+      # allocated for the group. Ignores incoming arguments.
+      #
+      def startup(*args)
+        bootstrap_vagrant_ipsupport
+
+        ChefWorkflow::IPSupport.delete_role(name)
+
+        @prison = Vagrant::Prison.new(Dir.mktmpdir, false)
+        prison.name = name
+        prison.configure do |config|
+          config.vm.box_url = ChefWorkflow::VagrantSupport.box_url
+          config.vm.box = ChefWorkflow::VagrantSupport.box
+          number_of_servers.times do |x|
+            ip = ChefWorkflow::IPSupport.unused_ip
+            ChefWorkflow::IPSupport.assign_role_ip(name, ip)
+            config.vm.define "#{name}-#{x}" do |this_config|
+              this_config.vm.network :hostonly, ip
+            end
           end
         end
+
+        prison.construct(:ui_class => ui_class)
+        @db[name] = prison # eager save in case start has issues
+
+        return prison.start ? ips : false
+      ensure
+        @db[name] = prison
       end
 
-      prison.construct(:ui_class => ui_class)
+      #
+      # Deprovisions the servers for this group, and cleans up the prison and
+      # allocated IP addresses.
+      #
+      def shutdown
+        @prison ||= @db[name]
 
-      return prison.start ? ips : false
-    end
+        if prison
+          prison.configure_environment(:ui_class => ui_class)
+          prison.cleanup
+        end
+        ChefWorkflow::IPSupport.delete_role(name)
+        @db.delete(name)
+        return true
+      end
 
-    #
-    # Deprovisions the servers for this group, and cleans up the prison and
-    # allocated IP addresses.
-    #
-    def shutdown
-      if prison
-        prison.configure_environment(:ui_class => ui_class)
-        prison.cleanup
+      def report
+        ["#{@number_of_servers} servers; prison dir: #{@prison.dir}"]
       end
-      IPSupport.singleton.delete_role(name)
     end
   end
 end

data/lib/chef-workflow/version.rb

@@ -1,6 +1,4 @@
-class Chef
-  module Workflow
-    # The gem version.
-    VERSION = "0.1.1"
-  end
+module ChefWorkflow
+  # The gem version.
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-prison
@@ -75,6 +75,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: knife-server
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: deprecated
+  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: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +164,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -124,6 +173,9 @@ files:
 - chef-workflow.gemspec
 - lib/chef-workflow.rb
 - lib/chef-workflow/support/attr.rb
+- lib/chef-workflow/support/db.rb
+- lib/chef-workflow/support/db/basic.rb
+- lib/chef-workflow/support/db/group.rb
 - lib/chef-workflow/support/debug.rb
 - lib/chef-workflow/support/ec2.rb
 - lib/chef-workflow/support/general.rb
@@ -132,10 +184,12 @@ files:
 - lib/chef-workflow/support/knife-plugin.rb
 - lib/chef-workflow/support/knife.rb
 - lib/chef-workflow/support/scheduler.rb
+- lib/chef-workflow/support/ssh.rb
 - lib/chef-workflow/support/vagrant.rb
 - lib/chef-workflow/support/vm.rb
 - lib/chef-workflow/support/vm/chef_server.rb
 - lib/chef-workflow/support/vm/ec2.rb
+- lib/chef-workflow/support/vm/helpers/knife.rb
 - lib/chef-workflow/support/vm/knife.rb
 - lib/chef-workflow/support/vm/vagrant.rb
 - lib/chef-workflow/version.rb
@@ -159,9 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A comprehensive rake-based workflow for chef
 test_files: []
-has_rdoc: