cap_reserve 0.1.7 → 0.1.8

data/cap_reserve.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "cap_reserve"
-  s.version     = '0.1.7'
+  s.version     = '0.1.8'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ "Winton Welsh" ]
   s.email       = [ "mail@wintoni.us" ]

data/lib/cap_reserve.rb

@@ -55,8 +55,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Reserve environment using RESERVE=minutes"
     task :default do
       begin
-        env, user, time, force, url, destroy, branch =
-          ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY'], ENV['BRANCH']
+        env, time, force, url, destroy, branch =
+          ENV['RESERVE_ENV'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY'], ENV['BRANCH']
+        user = ENV['DEPLOYER'] || ENV['USER']
 
         help = <<-HELP
 FORCE=1 to deploy anyway
@@ -84,7 +85,7 @@ HELP
             create.call(:force => true)
           else
             res = get.call("#{url}/reservations/show", :environment => env)
-            if res['status'] == 'reserved'
+            if res['status'] == 'reserved' and res['user'] != user
               puts "\n#{"Reservation exists".red}: #{"#{res['user']}@#{env}".yellow} (#{expires_to_string.call(Time.at(res['expires'])).yellow})\n#{help}\n"
               exit 0
             else

metadata

@@ -1,64 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cap_reserve
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.1.8
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-13 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Uses a maitre_d server to reserve time on deploy environments.
-email: 
+email:
 - mail@wintoni.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -68,40 +59,30 @@ files:
 - lib/cap_reserve.rb
 - spec/cap_reserve_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://guthub.com/winton/cap_reserve
 licenses: []
-
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Uses a maitre_d server to reserve time on deploy environments
-test_files: 
+test_files:
 - spec/cap_reserve_spec.rb
 - spec/spec_helper.rb