chef-expander 0.10.4 → 0.10.6.beta.1

data/lib/chef/expander/cluster_supervisor.rb

@@ -67,6 +67,9 @@ module Chef
         start_workers
         maintain_workers
         release_locks
+      rescue Configuration::InvalidConfiguration => e
+        log.fatal {"Configuration Error: " + e.message}
+        exit(2)
       rescue Exception => e
         raise if SystemExit === e
 

data/lib/chef/expander/configuration.rb

@@ -41,6 +41,7 @@ module Chef
       config.merge_config(Configuration::Base.from_chef_compat_config(config_file_to_use))
       # But for all other config options, the CLI config should win over config file
       config.merge_config(Configuration::CLI.config)
+      config.validate!
       remaining_opts_after_parse
     end
 
@@ -128,18 +129,21 @@ module Chef
         end
 
         configurable :index do
-          invalid("You must specify this node's position in the ring as an integer") unless index.kind_of?(Integer)
-          invalid("The index cannot be larger than the cluster size (node-count)") unless (index <= node_count.to_i)
+          unless index.nil? # in single-cluster mode, this setting is not required.
+            invalid("You must specify this node's position in the ring as an integer") unless index.kind_of?(Integer)
+            invalid("The index cannot be larger than the cluster size (node-count)") unless (index.to_i <= node_count.to_i)
+          end
         end
 
-        configurable :node_count do
-          invalid("You must specify the cluster size as an integer") unless node_count.kind_of?(Integer)
-          invalid("The cluster size (node-count) cannot be smaller than the index") unless node_count >= index.to_i
+        configurable :node_count, 1 do
+          invalid("You must specify the node_count as an integer") unless node_count.kind_of?(Integer)
+          invalid("The node_count must be 1 or greater") unless node_count >= 1
+          invalid("The node_count cannot be smaller than the index") unless node_count >= index.to_i
         end
 
         configurable :ps_tag, ""
 
-        configurable :solr_url, "http://localhost:8983"
+        configurable :solr_url, "http://localhost:8983/solr"
 
         configurable :amqp_host, '0.0.0.0'
 

data/lib/chef/expander/solrizer.rb

@@ -251,7 +251,7 @@ module Chef
       end
 
       def solr_url
-        'http://127.0.0.1:8983/solr/update'
+        "#{Expander.config.solr_url}/update"
       end
 
       def indexed_object

data/lib/chef/expander/version.rb

@@ -23,11 +23,15 @@ require 'open3'
 module Chef
   module Expander
 
-    VERSION = "0.10.4"
+    VERSION = "0.10.6.beta.1"
 
     def self.version
       @rev ||= begin
-        rev = Open3.popen3("git rev-parse HEAD") {|stdin, stdout, stderr| stdout.read }.strip
+        begin
+          rev = Open3.popen3("git rev-parse HEAD") {|stdin, stdout, stderr| stdout.read }.strip
+        rescue Errno::ENOENT
+          rev = ""
+        end
         rev.empty? ? nil : " (#{rev})"
       end
       "#{VERSION}#@rev"

data/lib/chef/expander/vnode_supervisor.rb

@@ -65,7 +65,7 @@ module Chef
         @awaiting_parent_death = EM.add_periodic_timer(1) do
           unless Process.ppid == @original_ppid
             @awaiting_parent_death.cancel
-            stop("master process death")
+            stop_immediately("master process death")
           end
         end
       end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-expander
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 4
-  version: 0.10.4
+  prerelease: 7
+  version: 0.10.6.beta.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-10-31 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-log
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id001
@@ -41,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 6
-        - 7
         version: 0.6.7
   type: :runtime
   version_requirements: *id002
@@ -57,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id003
@@ -73,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 2
-        - 11
         version: 0.2.11
   type: :runtime
   version_requirements: *id004
@@ -89,11 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 7
-        - 7
         version: 0.7.7
   type: :runtime
   version_requirements: *id005
@@ -105,11 +76,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
         version: 2.1.1
   type: :runtime
   version_requirements: *id006
@@ -121,11 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id007
@@ -137,11 +98,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
         version: 0.7.3
   type: :runtime
   version_requirements: *id008
@@ -153,14 +109,53 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rspec-core
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec-expectations
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rspec-mocks
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id013
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: adam@opscode.com
 executables: 
@@ -175,28 +170,29 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - README.rdoc
+- scripts/check_queue_size
 - scripts/check_queue_size_munin
 - scripts/make_solr_xml
-- scripts/check_queue_size
 - scripts/traffic-creator
 - conf/chef-expander.rb.example
-- lib/chef/expander.rb
-- lib/chef/expander/node.rb
-- lib/chef/expander/loggable.rb
-- lib/chef/expander/vnode_table.rb
-- lib/chef/expander/version.rb
-- lib/chef/expander/vnode_supervisor.rb
-- lib/chef/expander/vnode.rb
-- lib/chef/expander/logger.rb
-- lib/chef/expander/daemonizable.rb
 - lib/chef/expander/cluster_supervisor.rb
-- lib/chef/expander/flattener.rb
+- lib/chef/expander/configuration.rb
 - lib/chef/expander/control.rb
+- lib/chef/expander/daemonizable.rb
+- lib/chef/expander/flattener.rb
+- lib/chef/expander/loggable.rb
+- lib/chef/expander/logger.rb
+- lib/chef/expander/node.rb
 - lib/chef/expander/solrizer.rb
-- lib/chef/expander/configuration.rb
+- lib/chef/expander/version.rb
+- lib/chef/expander/vnode.rb
+- lib/chef/expander/vnode_supervisor.rb
+- lib/chef/expander/vnode_table.rb
+- lib/chef/expander.rb
 - bin/chef-expander
 - bin/chef-expander-vnode
 - bin/chef-expanderctl
+has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 
@@ -210,23 +206,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.