cap_reserve 0.1.7 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/cap_reserve.gemspec +1 -1
  2. data/lib/cap_reserve.rb +4 -3
  3. metadata +45 -64
data/cap_reserve.gemspec CHANGED
@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "cap_reserve"
9
- s.version = '0.1.7'
9
+ s.version = '0.1.8'
10
10
  s.platform = Gem::Platform::RUBY
11
11
  s.authors = [ "Winton Welsh" ]
12
12
  s.email = [ "mail@wintoni.us" ]
data/lib/cap_reserve.rb CHANGED
@@ -55,8 +55,9 @@ Capistrano::Configuration.instance(:must_exist).load do
55
55
  desc "Reserve environment using RESERVE=minutes"
56
56
  task :default do
57
57
  begin
58
- env, user, time, force, url, destroy, branch =
59
- ENV['RESERVE_ENV'], ENV['USER'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY'], ENV['BRANCH']
58
+ env, time, force, url, destroy, branch =
59
+ ENV['RESERVE_ENV'], ENV['RESERVE'], ENV['FORCE'], ENV['RESERVE_URL'], ENV['DESTROY'], ENV['BRANCH']
60
+ user = ENV['DEPLOYER'] || ENV['USER']
60
61
 
61
62
  help = <<-HELP
62
63
  FORCE=1 to deploy anyway
@@ -84,7 +85,7 @@ HELP
84
85
  create.call(:force => true)
85
86
  else
86
87
  res = get.call("#{url}/reservations/show", :environment => env)
87
- if res['status'] == 'reserved'
88
+ if res['status'] == 'reserved' and res['user'] != user
88
89
  puts "\n#{"Reservation exists".red}: #{"#{res['user']}@#{env}".yellow} (#{expires_to_string.call(Time.at(res['expires'])).yellow})\n#{help}\n"
89
90
  exit 0
90
91
  else
metadata CHANGED
@@ -1,64 +1,55 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: cap_reserve
3
- version: !ruby/object:Gem::Version
4
- hash: 21
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.1.8
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 1
9
- - 7
10
- version: 0.1.7
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Winton Welsh
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-02-13 00:00:00 -08:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2013-02-17 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: rspec
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
25
17
  none: false
26
- requirements:
18
+ requirements:
27
19
  - - ~>
28
- - !ruby/object:Gem::Version
29
- hash: 15
30
- segments:
31
- - 1
32
- - 0
33
- version: "1.0"
20
+ - !ruby/object:Gem::Version
21
+ version: '1.0'
34
22
  type: :development
35
- version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: yajl-ruby
38
23
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '1.0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: yajl-ruby
32
+ requirement: !ruby/object:Gem::Requirement
40
33
  none: false
41
- requirements:
42
- - - "="
43
- - !ruby/object:Gem::Version
44
- hash: 23
45
- segments:
46
- - 1
47
- - 0
48
- - 0
34
+ requirements:
35
+ - - '='
36
+ - !ruby/object:Gem::Version
49
37
  version: 1.0.0
50
38
  type: :runtime
51
- version_requirements: *id002
39
+ prerelease: false
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - '='
44
+ - !ruby/object:Gem::Version
45
+ version: 1.0.0
52
46
  description: Uses a maitre_d server to reserve time on deploy environments.
53
- email:
47
+ email:
54
48
  - mail@wintoni.us
55
49
  executables: []
56
-
57
50
  extensions: []
58
-
59
51
  extra_rdoc_files: []
60
-
61
- files:
52
+ files:
62
53
  - .gitignore
63
54
  - Gemfile
64
55
  - LICENSE
@@ -68,40 +59,30 @@ files:
68
59
  - lib/cap_reserve.rb
69
60
  - spec/cap_reserve_spec.rb
70
61
  - spec/spec_helper.rb
71
- has_rdoc: true
72
62
  homepage: http://guthub.com/winton/cap_reserve
73
63
  licenses: []
74
-
75
64
  post_install_message:
76
65
  rdoc_options: []
77
-
78
- require_paths:
66
+ require_paths:
79
67
  - lib
80
- required_ruby_version: !ruby/object:Gem::Requirement
68
+ required_ruby_version: !ruby/object:Gem::Requirement
81
69
  none: false
82
- requirements:
83
- - - ">="
84
- - !ruby/object:Gem::Version
85
- hash: 3
86
- segments:
87
- - 0
88
- version: "0"
89
- required_rubygems_version: !ruby/object:Gem::Requirement
70
+ requirements:
71
+ - - ! '>='
72
+ - !ruby/object:Gem::Version
73
+ version: '0'
74
+ required_rubygems_version: !ruby/object:Gem::Requirement
90
75
  none: false
91
- requirements:
92
- - - ">="
93
- - !ruby/object:Gem::Version
94
- hash: 3
95
- segments:
96
- - 0
97
- version: "0"
76
+ requirements:
77
+ - - ! '>='
78
+ - !ruby/object:Gem::Version
79
+ version: '0'
98
80
  requirements: []
99
-
100
81
  rubyforge_project:
101
- rubygems_version: 1.4.2
82
+ rubygems_version: 1.8.23
102
83
  signing_key:
103
84
  specification_version: 3
104
85
  summary: Uses a maitre_d server to reserve time on deploy environments
105
- test_files:
86
+ test_files:
106
87
  - spec/cap_reserve_spec.rb
107
88
  - spec/spec_helper.rb