right_develop 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/right_develop/commands/git.rb

@@ -26,8 +26,6 @@ require "action_view"
 
 module RightDevelop::Commands
   class Git
-    include ActionView::Helpers::DateHelper
-
     NAME_SPLIT_CHARS = /-|_|\//
     YES              = /(ye?s?)/i
     NO               = /(no?)/i
@@ -70,9 +68,9 @@ EOS
 
       case task
       when "prune"
-        repo = ::RightGit::Repository.new(
+        repo = ::RightGit::Git::Repository.new(
           ::Dir.pwd,
-          ::RightDevelop::Utility::Git::DEFALT_REPO_OPTIONS)
+          ::RightDevelop::Utility::Git::DEFAULT_REPO_OPTIONS)
         self.new(repo, :prune, options)
       else
         Trollop.die "unknown task #{task}"
@@ -88,15 +86,9 @@ EOS
     def initialize(repo, task, options)
       # Post-process "age" option; transform from natural-language expression into a timestamp.
       if (age = options.delete(:age))
-        age = age.gsub(/\s+/, ".")
-
-        if age =~ /^[0-9]+\.?(hours|days|weeks|months|years)$/
-          age = eval(age).ago
-        elsif age =~ /^[0-9]+$/
-          age = age.to_i.months.ago
-        else
-          raise ArgumentError, "Can't parse age of '#{age}'"
-        end
+        require 'ruby-debug'
+        debugger
+        age = parse_age(age)
         options[:age] = age
       end
 
@@ -212,5 +204,61 @@ EOS
         end
       end
     end
+
+    # An ordered list of time intervals of decreasing magnitude. Stored as Array and not Hash in
+    # order to ensure consistent traversal order between Ruby 1.8 and 1.9+.
+    TIME_INTERVALS = [
+      [31_557_600, 'year'],
+      [2_592_000, 'month'],
+      [604_800, 'week'],
+      [86_400, 'day'],
+      [3_600, 'hour'],
+      [60, 'minute'],
+      [1, 'second'],
+    ]
+
+    def time_ago_in_words(once_upon_a)
+      dt = Time.now.to_f - once_upon_a.to_f
+
+      words = nil
+
+      TIME_INTERVALS.each do |pair|
+        mag, term = pair.first, pair.last
+        if dt >= mag
+          units = dt / mag
+          words = "%d %s%s" % [units, term, units > 1 ? 's' : '']
+          break
+        end
+      end
+
+      if words
+        words
+      else
+        once_upon_a.strftime("%Y-%m-%d")
+      end
+    end
+
+    def parse_age(str)
+      ord, word = str.split(/[. ]+/, 2)
+      ord = Integer(ord)
+      word.gsub!(/s$/, '')
+
+      ago = nil
+
+      TIME_INTERVALS.each do |pair|
+        mag, term = pair.first, pair.last
+
+        if term == word
+          ago = Time.at(Time.now.to_i - ord * mag)
+          break
+        end
+      end
+
+      if ago
+        ago
+      else
+        raise ArgumentError, "Cannot parse '#{str}' as an age"
+      end
+    end
   end
 end

data/lib/right_develop/utility/shell.rb

@@ -118,7 +118,7 @@ module RightDevelop
         executioner = super(executioner, options)
 
         # clean all bundler env vars, if requested.
-        if options[:clean_bundler_env]
+        if options[:clean_bundler_env] && defined?(::Bundler)
           executioner = lambda do |e|
             lambda { ::Bundler.with_clean_env { e.call } }
           end.call(executioner)

data/right_develop.gemspec

@@ -4,20 +4,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "right_develop"
-  s.version = "2.0.1"
+  s.name = %q{right_develop}
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro"]
-  s.date = "2013-12-06"
-  s.description = "A toolkit of development tools created by RightScale."
-  s.email = "support@rightscale.com"
+  s.date = %q{2014-01-13}
+  s.default_executable = %q{right_develop}
+  s.description = %q{A toolkit of development tools created by RightScale.}
+  s.email = %q{support@rightscale.com}
   s.executables = ["right_develop"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
+    ".ruby-version",
     "CHANGELOG.rdoc",
     "LICENSE",
     "README.rdoc",
@@ -48,11 +50,11 @@ Gem::Specification.new do |s|
     "right_develop.gemspec",
     "right_develop.rconf"
   ]
-  s.homepage = "https://github.com/rightscale/right_develop"
+  s.homepage = %q{https://github.com/rightscale/right_develop}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Reusable dev & test code."
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Reusable dev & test code.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -64,7 +66,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
       s.add_runtime_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
       s.add_runtime_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["< 4.0", ">= 2.3.0"])
       s.add_runtime_dependency(%q<right_git>, [">= 0"])
       s.add_runtime_dependency(%q<right_aws>, [">= 2.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -76,7 +77,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
       s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
       s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
-      s.add_dependency(%q<actionpack>, ["< 4.0", ">= 2.3.0"])
       s.add_dependency(%q<right_git>, [">= 0"])
       s.add_dependency(%q<right_aws>, [">= 2.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -89,7 +89,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["< 3.0", ">= 1.3"])
     s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
     s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
-    s.add_dependency(%q<actionpack>, ["< 4.0", ">= 2.3.0"])
     s.add_dependency(%q<right_git>, [">= 0"])
     s.add_dependency(%q<right_aws>, [">= 2.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

metadata

@@ -1,231 +1,215 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: right_develop
-version: !ruby/object:Gem::Version
-  version: 2.0.1
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 2
+  version: 2.0.2
 platform: ruby
-authors:
+authors: 
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+
+date: 2014-01-13 00:00:00 -08:00
+default_executable: right_develop
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ! '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: right_support
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: *id001
+  name: rake
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id002
+  name: right_support
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  prerelease: false
+  requirement: *id003
   name: builder
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id004
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id005
+  name: cucumber
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  prerelease: false
+  requirement: *id006
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
+  requirement: *id007
   name: right_git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: right_aws
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  requirement: *id008
+  name: right_aws
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id009
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 4
+        - 2
         version: 2.4.2
+  prerelease: false
+  requirement: *id010
+  name: rdoc
 description: A toolkit of development tools created by RightScale.
 email: support@rightscale.com
-executables:
+executables: 
 - right_develop
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-files:
+files: 
 - .ruby-version
 - CHANGELOG.rdoc
 - LICENSE
@@ -256,32 +240,39 @@ files:
 - lib/right_develop/utility/versioning.rb
 - right_develop.gemspec
 - right_develop.rconf
+has_rdoc: true
 homepage: https://github.com/rightscale/right_develop
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1605047382053120041
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Reusable dev & test code.
 test_files: []
+