cluster_chef-knife 3.0.12 → 3.0.14

data/lib/chef/knife/cluster_ssh.rb

@@ -53,7 +53,7 @@ class Chef
 
         @action_nodes = target.chef_nodes
         addresses = target.servers.map do |svr|
-          if (svr.cloud.public_ip)            then address = svr.cloud.public_ip ; end
+          if (svr.cloud.public_ip)             then address = svr.cloud.public_ip ; end
           if (not address) && (svr.fog_server) then address = svr.fog_server.public_ip_address ; end
           if (not address) && (svr.chef_node)  then address = format_for_display( svr.chef_node )[config[:attribute]] ; end
           address
@@ -64,8 +64,55 @@ class Chef
         session_from_list(addresses)
       end
 
+      #
+      # Override the one in Chef::Knife::Ssh to allow an err flag (prints in red
+      # if non-null)
+      #
+      def print_data(host, data, err=nil)
+        if data =~ /\n/
+          data.split(/\n/).each { |d| print_data(host, d, err) }
+        else
+          padding = @longest - host.length
+          str = ui.color(host, :cyan) + (" " * (padding + 1)) + (err ? ui.color(data, :red) : data)
+          ui.msg(str)
+        end
+      end
+
+      #
+      # Override the one in Chef::Knife::Ssh to give a big red warning if the
+      # process executes with badness
+      #
+      def ssh_command(command, subsession=nil)
+        subsession ||= session
+        command = fixup_sudo(command)
+        notifications = []
+        subsession.open_channel do |ch|
+          ch.request_pty
+          ch.exec command do |ch, success|
+            raise ArgumentError, "Cannot execute #{command}" unless success
+            # note: you can't do the stderr calback because requesting a pty
+            # squashes stderr and stdout together
+            ch.on_data do |ichannel, data|
+              print_data(ichannel[:host], data)
+              if data =~ /^knife sudo password: /
+                ichannel.send_data("#{get_password}\n")
+              end
+            end
+            ch.on_request "exit-status" do |ichannel, data|
+              exit_status = data.read_long
+              if exit_status != 0
+                command_snippet = (command.length < 70) ? command : (command[0..45] + ' ... ' + command[-19..-1])
+                notifications << [ichannel[:host], "'#{command_snippet.gsub(/[\r\n]+/, "; ")}' terminated with error status #{exit_status}", :err]
+              end
+            end
+          end
+        end
+        session.loop
+        notifications.each{|args| print_data(*args) }
+      end
+
       def cssh
-        exec "cssh "+session.servers_for.map {|server| server.user ? "#{server.user}@#{server.host}" : server.host}.join(" ")
+        exec "cssh "+session.servers_for.map{|server| server.user ? "#{server.user}@#{server.host}" : server.host}.join(" ")
       end
 
       def run

data/lib/chef/knife/cluster_start.rb

@@ -27,6 +27,14 @@ class Chef
       def relevant?(server)
         server.startable?
       end
+
+      def perform_execution(target)
+        section("Starting machines")
+        super(target)
+        section("Announcing Chef nodes as started")
+        target.send(:delegate_to_servers, :announce_as_started)
+      end
+
     end
   end
 end

data/lib/chef/knife/cluster_stop.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
 
 class Chef
@@ -27,6 +26,13 @@ class Chef
         server.running?
       end
 
+      def perform_execution(target)
+        section("Stopping machines")
+        super(target)
+        section("Announcing Chef nodes as stopped")
+        target.send(:delegate_to_servers, :announce_as_stopped)
+      end
+
       def confirm_execution(target)
         ui.info "  Unless these nodes are backed by EBS volumes, this will result in loss of all data"
         ui.info "  not saved elsewhere. Even if they are EBS backed, there may still be some data loss."

data/lib/chef/knife/cluster_sync.rb

@@ -25,12 +25,12 @@ class Chef
 
       option :cloud,
         :long        => "--[no-]cloud",
-        :description => "Sync to the cloud (default syncs cloud; use --no-cloud to skip)",
+        :description => "Sync to the cloud (default is yes, sync cloud; use --no-cloud to skip)",
         :default     => true,
         :boolean     => true
       option :chef,
         :long        => "--[no-]chef",
-        :description => "Sync to the chef server (default syncs chef; use --no-chef to skip)",
+        :description => "Sync to the chef server (default is yes, sync chef; use --no-chef to skip)",
         :default     => true,
         :boolean     => true
       option :sync_all,

data/lib/chef/knife/knife_common.rb

@@ -173,20 +173,17 @@ module ClusterChef
 
     module ClassMethods
       def sub_command
-        self.to_s.gsub(/^.*::/, '').gsub!(/^Cluster/, '').downcase
+        self.to_s.gsub(/^.*::/, '').gsub(/^Cluster/, '').downcase
       end
 
       def import_banner_and_options(klass, options={})
         options[:except] ||= []
-        klass.options.each do |name, info|
+        deps{ klass.load_deps }
+        klass.options.sort.each do |name, info|
           next if options.include?(name) || options[:except].include?(name)
           option name, info
         end
         banner "knife cluster #{sub_command} CLUSTER_NAME [FACET_NAME [INDEXES]] (options)"
-
-        deps do
-          klass.load_deps
-        end
       end
     end
     def self.included(base)

metadata

@@ -1,126 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cluster_chef-knife
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.14
   prerelease: 
-  version: 3.0.12
 platform: ruby
-authors: 
+authors:
 - Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70259604124020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604124020
+- !ruby/object:Gem::Dependency
   name: fog
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70259604122180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604122180
+- !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70259604119900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604119900
+- !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70259604119160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604119160
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70259604118180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604118180
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70259604133600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604133600
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70259604133000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604133000
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70259604132480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259604132480
+- !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70259604131700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *id009
-description: cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.
+  version_requirements: *70259604131700
+description: cluster_chef-knife allows you to orchestrate not just systems but clusters
+  of machines. It includes a powerful layer on top of knife and a collection of cloud
+  cookbooks.
 email: coders@infochimps.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -132,10 +131,11 @@ files:
 - VERSION
 - chefignore
 - cluster_chef-knife.gemspec
-- clusters/website_demo.rb
 - config/client.rb
 - config/proxy.pac
-- lib/chef/knife/bootstrap/ubuntu10.04-basic.erb
+- config/ubuntu10.04-cluster_chef.erb
+- config/ubuntu11.10-cluster_chef.erb
+- ironfan.gemspec
 - lib/chef/knife/bootstrap/ubuntu10.04-cluster_chef.erb
 - lib/chef/knife/bootstrap/ubuntu11.10-cluster_chef.erb
 - lib/chef/knife/cluster_bootstrap.rb
@@ -164,36 +164,37 @@ files:
 - tasks/chef_config.rake
 - tasks/jeweler_use_alt_branch.rake
 homepage: http://infochimps.com/labs
-licenses: 
+licenses:
 - apachev2
-post_install_message: 
+post_install_message: ! "!! This gem has been renamed 'ironfan' (from cluster_chef).
+  \n   It will not be updated after Feb. 2012. \n  Sorry for the inconvenience."
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 373181579172920968
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 115206257048957134
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.
-test_files: 
+summary: cluster_chef-knife allows you to orchestrate not just systems but clusters
+  of machines. It includes a powerful layer on top of knife and a collection of cloud
+  cookbooks.
+test_files:
 - spec/cluster_chef/cluster_spec.rb
 - spec/cluster_chef/facet_spec.rb
 - spec/cluster_chef/server_slice_spec.rb

data/clusters/website_demo.rb

@@ -1,65 +0,0 @@
-ClusterChef.cluster 'webserver_demo' do
-  cloud :ec2 do
-    defaults
-    availability_zones ['us-east-1d']
-    flavor              't1.micro'  # change to something larger for serious use
-    backing             'ebs'
-    image_name          'natty'
-    bootstrap_distro    'ubuntu10.04-cluster_chef'
-    chef_client_script  'client.rb'
-    mount_ephemerals(:tags => { :scratch_dirs => true })
-  end
-
-  role                  "nfs_client"
-  recipe                "package_set"
-
-  facet :webnode do
-    instances           6
-    role                "nginx"
-    role                "redis_client"
-    role                "mysql_client"
-    role                "elasticsearch_client"
-    role                "awesome_website"
-    role                "web_server"      # this triggers opening appropriate ports
-    # Rotate nodes among availability zones
-    azs = ['us-east-1d', 'us-east-1b', 'us-east-1c']
-    (0...instances).each do |idx|
-      server(idx).cloud.availability_zones [azs[ idx % azs.length ]]
-    end
-    # Rote nodes among A/B testing groups
-    (0..instances).each do |idx|
-      server(idx).chef_node.normal[:split_testing] = ( (idx % 2 == 0) ? 'A' : 'B' )
-    end
-  end
-
-  facet :dbnode do
-    instances           2
-    role                "mysql_server"
-    role                "redis_client"
-    # burly master, wussier slaves
-    cloud.flavor        "m1.large"
-    server(0) do
-      cloud.flavor      "c1.xlarge"
-    end
-
-    volume(:data) do
-      size          50
-      keep          true
-      device        '/dev/sdi'
-      mount_point   '/data/db'
-      mount_options 'defaults,nouuid,noatime'
-      fstype       'xfs'
-      snapshot_id   'snap-d9c1edb1'
-    end
-  end
-
-  facet :esnode do
-    instances           1
-    role                "nginx"
-    role                "redis_server"
-    role                "elasticsearch_data_esnode"
-    role                "elasticsearch_http_esnode"
-    #
-    cloud.flavor        "m1.large"
-  end
-end