chef 0.9.8.beta.2 → 0.9.8.rc.0

data/lib/chef/knife.rb

@@ -184,6 +184,11 @@ class Chef
       @name_args = parse_options(argv)
       @name_args.reject! { |name_arg| command_name_words.delete(name_arg) }
 
+      # knife node run_list add requires that we have extra logic to handle
+      # the case that command name words could be joined by an underscore :/
+      command_name_words = command_name_words.join('_')
+      @name_args.reject! { |name_arg| command_name_words == name_arg }
+
       if config[:help]
         msg opt_parser
         exit 1

data/lib/chef/knife/status.rb

@@ -31,10 +31,15 @@ class Chef
       end
 
       def run
+        all_nodes = []
         Chef::Search::Query.new.search(:node, '*:*') do |node|
-          current_time = DateTime.now
-          date = DateTime.parse(Time.at(node["ohai_time"]).to_s)
-          hours, minutes, seconds, frac = DateTime.day_fraction_to_time(current_time - date)
+          all_nodes << node
+        end
+        all_nodes.sort { |n1, n2| n1["ohai_time"] <=> n2["ohai_time"] }.each do |node|
+          # 59 seconds
+          # 1000 hours
+          # date = DateTime.parse(Time.at(node["ohai_time"]).to_s)
+          hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
           hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
           minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
           if hours > 24
@@ -45,7 +50,21 @@ class Chef
             highline.say("<%= color('#{minutes_text}', GREEN) %> ago, #{node['fqdn']} checked in as a #{node['platform']} #{node['platform_version']} node.")
           end
         end
+
       end
+
+      # :nodoc:
+      # TODO: this is duplicated from StatusHelper in the Webui. dedup.
+      def time_difference_in_hms(unix_time)
+        now = Time.now.to_i
+        difference = now - unix_time.to_i
+        hours = (difference / 3600).to_i
+        difference = difference % 3600
+        minutes = (difference / 60).to_i
+        seconds = (difference % 60)
+        return [hours, minutes, seconds]
+      end
+
     end
   end
 end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.8.beta.2'
+  VERSION = '0.9.8.rc.0'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
+  hash: 15424197
   prerelease: true
   segments: 
   - 0
   - 9
   - 8
-  - beta
-  - 2
-  version: 0.9.8.beta.2
+  - rc
+  - 0
+  version: 0.9.8.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -57,6 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -72,6 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -87,11 +92,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 6
+        version: 0.5.6
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -102,6 +108,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -109,6 +116,7 @@ dependencies:
         version: 1.0.4
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -124,6 +132,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
@@ -139,6 +148,7 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -154,6 +164,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -167,6 +178,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -180,6 +192,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -193,6 +206,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -206,6 +220,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -574,6 +589,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -582,6 +598,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3