chef-workflow 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+* 0.2.2 March 12, 2013
+  * Vagrant box customizations via "customizations" attribute in
+    `configure_vagrant`. Takes an array of arrays that are injected into the
+    Vagrantfile as `vm.customize` lines. Patch by Greg Thornton.
+  * Fixes around Net::SSH use of sudo and PTYs.
+  * Some additional information about configuration in `chef-workflow-bootstrap`.
 * 0.2.1 February 20, 2013
   * Fixate JSON dependnecy to keep knife from breaking in bundles.
 * 0.2.0 February 8, 2013 

data/bin/chef-workflow-bootstrap

@@ -67,6 +67,15 @@ end
 configure_vagrant do
   # if you wish to use a different box, supply it as a url here.
   # box_url "http://files.vagrantup.com/precise32.box"
+  #
+  # if you wish to customize the vms, such as modify the memory usage, use an
+  # array of arrays here. each inner array will be added to the vagrant files
+  # generated.
+  #
+  # example: customizations [ ["modifyvm", :id, "--memory", 1024] ]
+  # 
+  # customizations nil
+  # 
 end
 
 configure_knife do
@@ -97,7 +106,7 @@ configure_knife do
   # Note that you must have the 'minitest-handler' cookbook available on your
   # chef server for these to work.
   # 
-  # test_recipes []
+  # test_recipes [ ]
 end
 
 #
@@ -135,6 +144,9 @@ configure_ec2 do
   # need something more complicated, create your own groups by hand and set
   # `security_groups` above to those values. 
   # security_group_open_ports [22, 4000]
+  #
+  # how long to wait for the ec2 API before giving up.
+  # provision_wait 300
 end
 
 #

data/lib/chef-workflow/support/ssh.rb

@@ -34,7 +34,8 @@ module ChefWorkflow
     # heavy use of KnifeSupport to determine how to drive the command.
     #
     def configure_ssh_command(ip, command)
-      command = "#{ChefWorkflow::KnifeSupport.use_sudo ? 'sudo ': ''}#{command}"
+      use_sudo = ChefWorkflow::KnifeSupport.use_sudo
+      command = "#{use_sudo ? 'sudo ': ''}#{command}"
 
       options = { }
 
@@ -43,6 +44,12 @@ module ChefWorkflow
 
       Net::SSH.start(ip, ChefWorkflow::KnifeSupport.ssh_user, options) do |ssh|
         ssh.open_channel do |ch|
+          ch.request_pty do |ch, success|
+            if !success and use_sudo
+              raise "The use_sudo setting requires a PTY, and your SSH is rejecting our attempt to get one."
+            end
+          end
+
           ch.on_open_failed do |ch, code, desc|
             raise "Connection Error to #{ip}: #{desc}"
           end

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

@@ -1,11 +1,13 @@
 require 'fileutils'
 require 'chef-workflow/support/generic'
+require 'chef-workflow/support/attr'
 
 module ChefWorkflow
   #
   # Vagrant configuration settings. Uses `GenericSupport`.
   #
   class VagrantSupport
+    extend ChefWorkflow::AttrSupport
     include ChefWorkflow::GenericSupport
 
     # The default vagrant box we use for provisioning.
@@ -14,6 +16,8 @@ module ChefWorkflow
     # the calculated box, currently taken from the box_url. Expect this to change.
     attr_reader :box
 
+    fancy_attr :customizations
+
     #--
     # FIXME: support non-url boxes and ram configurations
     #++

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

@@ -70,6 +70,11 @@ module ChefWorkflow
         prison.configure do |config|
           config.vm.box_url = ChefWorkflow::VagrantSupport.box_url
           config.vm.box = ChefWorkflow::VagrantSupport.box
+
+          if customizations = ChefWorkflow::VagrantSupport.customizations
+            customizations.each { |c| config.vm.customize c }
+          end
+
           number_of_servers.times do |x|
             ip = ChefWorkflow::IPSupport.unused_ip
             ChefWorkflow::IPSupport.assign_role_ip(name, ip)

data/lib/chef-workflow/version.rb

@@ -1,4 +1,4 @@
 module ChefWorkflow
   # The gem version.
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-prison
@@ -221,18 +221,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3946338268663345754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3946338268663345754
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25