knife-reporting 0.3.1 → 0.3.2

data/lib/chef/knife/runs_list.rb

@@ -1,3 +1,22 @@
+#
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/reporting/knife_helpers'
+
 class Chef
   class Knife
     class RunsList < Chef::Knife
@@ -8,10 +27,9 @@ class Chef
         # modules be loaded.
         require 'time'
         require 'date'
-        require 'chef/knife/reporting_helpers'
       end
 
-      include ReportingHelpers
+      include Chef::Reporting::KnifeHelpers
 
       banner "knife runs list [<node name>]"
 
@@ -87,7 +105,7 @@ class Chef
         end
       end
 
+    end
   end
 end
-end
 

data/lib/chef/knife/runs_show.rb

@@ -1,3 +1,22 @@
+#
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/reporting/knife_helpers'
+
 class Chef
   class Knife
     class RunsShow < Chef::Knife
@@ -8,10 +27,9 @@ class Chef
         # modules be loaded.
         require 'time'
         require 'date'
-        require 'chef/knife/reporting_helpers'
       end
 
-      include ReportingHelpers
+      include Chef::Reporting::KnifeHelpers
 
       banner "knife runs show <run id>"
 

data/lib/chef/reporting/knife_helpers.rb

@@ -0,0 +1,93 @@
+#
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  module Reporting
+    module KnifeHelpers
+
+      # Need the unless guard b/c this code is dynamically loaded
+      # and can result in ruby warnings if it attempts to define the
+      # constant again
+      SECONDS_IN_24HOURS = 86400 unless const_defined?(:SECONDS_IN_24HOURS)
+      # Approximate, b/c of course the length of a month can vary
+      SECONDS_IN_3MONTHS = 7889230 unless const_defined?(:SECONDS_IN_3MONTHS)
+
+      def uuid?(run_id)
+        if run_id =~ /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/
+          return false
+        else
+          return true
+        end
+      end
+
+      def apply_time_args()
+        if config[:start_time] && config[:end_time]
+          start_time, end_time = convert_to_unix_timestamps()
+        else
+          start_time, end_time = last_24hours_time_window()
+        end
+
+        return start_time, end_time
+      end
+
+      def last_24hours_time_window()
+        # Time is calculated as a unix timestamp
+        end_time = Time.now.to_i
+        start_time = end_time - SECONDS_IN_24HOURS
+        return start_time, end_time
+      end
+
+      def check_start_and_end_times_provided()
+        if config[:start_time] && !config[:end_time]
+          ui.error("The start_time option was provided, but the end_time option was not. If one is provided, the other is required.")
+          exit 1
+        elsif config[:end_time] && !config[:start_time]
+          ui.error("The end_time option was provided, but the start_time option was not. If one is provided, the other is required.")
+          exit 1
+        end
+      end
+
+      def convert_to_unix_timestamps()
+        if config[:unix_timestamps]
+          start_time = config[:start_time].to_i
+          end_time = config[:end_time].to_i
+        else
+          # Take user supplied input, assumes it is in a valid date format,
+          # convert to a date object to ensure we have the proper date format for
+          # passing to the time object (but converting is not a validation step,
+          # so bad user input will still be bad)
+          # then convert to a time object, and then convert to a unix timestamp
+          # An error could potentially be thrown if the conversions don't work
+          # This does work on windows - to_i on time even on windows still returns a unix timestamp
+          # Verified on ruby 1.9.3 on a windows 2000 ami on aws
+          start_time = Time.parse(Date.strptime(config[:start_time], '%m-%d-%Y').to_s).to_i
+          end_time = Time.parse(Date.strptime(config[:end_time], '%m-%d-%Y').to_s).to_i
+        end
+
+        return start_time, end_time
+      end
+
+      def check_3month_window(start_time, end_time)
+        # start_time and end_time are unix timestamps
+        if (end_time - start_time) > SECONDS_IN_3MONTHS
+          ui.error("Requesting information for more than three months at a time is disallowed. Please try a smaller timeframe.")
+          exit 1
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-reporting
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70220669244540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220669244540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 description: Knife plugin for Opscode Reporting
 email: matthew@opscode.com
 executables: []
@@ -33,9 +38,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/chef/knife/reporting_helpers.rb
 - lib/chef/knife/runs_list.rb
 - lib/chef/knife/runs_show.rb
+- lib/chef/reporting/knife_helpers.rb
 homepage: http://www.opscode.com
 licenses: []
 post_install_message: 
@@ -56,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Knife plugin for Opscode Reporting

data/lib/chef/knife/reporting_helpers.rb

@@ -1,73 +0,0 @@
-module ReportingHelpers
-
-  # Need the unless guard b/c this code is dynamically loaded
-  # and can result in ruby warnings if it attempts to define the
-  # constant again
-  SECONDS_IN_24HOURS = 86400 unless const_defined?(:SECONDS_IN_24HOURS)
-  # Approximate, b/c of course the length of a month can vary
-  SECONDS_IN_3MONTHS = 7889230 unless const_defined?(:SECONDS_IN_3MONTHS)
-
-  def uuid?(run_id)
-    if run_id =~ /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/
-      return false
-    else
-      return true
-    end
-  end
-
-  def apply_time_args()
-    if config[:start_time] && config[:end_time]
-      start_time, end_time = convert_to_unix_timestamps()
-    else
-      start_time, end_time = last_24hours_time_window()
-    end
-
-    return start_time, end_time
-  end
-
-  def last_24hours_time_window()
-    # Time is calculated as a unix timestamp
-    end_time = Time.now.to_i
-    start_time = end_time - SECONDS_IN_24HOURS
-    return start_time, end_time
-  end
-
-  def check_start_and_end_times_provided()
-    if config[:start_time] && !config[:end_time]
-      ui.error("The start_time option was provided, but the end_time option was not. If one is provided, the other is required.")
-      exit 1
-    elsif config[:end_time] && !config[:start_time]
-      ui.error("The end_time option was provided, but the start_time option was not. If one is provided, the other is required.")
-      exit 1
-    end
-  end
-
-  def convert_to_unix_timestamps()
-    if config[:unix_timestamps]
-      start_time = config[:start_time].to_i
-      end_time = config[:end_time].to_i
-    else
-      # Take user supplied input, assumes it is in a valid date format,
-      # convert to a date object to ensure we have the proper date format for
-      # passing to the time object (but converting is not a validation step,
-      # so bad user input will still be bad)
-      # then convert to a time object, and then convert to a unix timestamp
-      # An error could potentially be thrown if the conversions don't work
-      # This does work on windows - to_i on time even on windows still returns a unix timestamp
-      # Verified on ruby 1.9.3 on a windows 2000 ami on aws
-      start_time = Time.parse(Date.strptime(config[:start_time], '%m-%d-%Y').to_s).to_i
-      end_time = Time.parse(Date.strptime(config[:end_time], '%m-%d-%Y').to_s).to_i
-    end
-
-    return start_time, end_time
-  end
-
-  def check_3month_window(start_time, end_time)
-    # start_time and end_time are unix timestamps
-    if (end_time - start_time) > SECONDS_IN_3MONTHS
-      ui.error("Requesting information for more than three months at a time is disallowed. Please try a smaller timeframe.")
-      exit 1
-    end
-  end
-
-end