rubber 2.6.4 → 2.6.5

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +7 -1
  3. data/CHANGELOG +10 -1
  4. data/lib/rubber/recipes/rubber.rb +10 -3
  5. data/lib/rubber/vagrant/provisioner.rb +13 -8
  6. data/lib/rubber/version.rb +1 -1
  7. data/templates/base/config/rubber/rubber.yml +1 -1
  8. metadata +31 -31
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5114eacd77e6f57f82ea071185bba2526ecb1684
4
- data.tar.gz: 4dc0cb1cabc07928b0ba0c31ada5d585c1194797
3
+ metadata.gz: 0994ced4a1d19f61e742eab894f3f268f398e50e
4
+ data.tar.gz: 5ad9bdec1b4ff61e4aa4984b0b75dc8940635274
5
5
  SHA512:
6
- metadata.gz: 5986315d8ad24328de8c556f3e2eaf4bccc5b61117b98721a9ef19c9600b4a4c34c1d5420f4d2e3a24639099ba15c99783f9655ef4b7beb7df9076f8e70d4156
7
- data.tar.gz: 1124e91c5d0fd869bb78de77e1db76a267bde4b570d0dd4b5c66e39996f41a67570fe92448dd54386b23cbfb3728d65cb1f999b560afb51cb6152c369271f753
6
+ metadata.gz: e54d4a074a8b624b8f7708d984d6f5636cb73dc5f03f60b1e2fc6cef9129aa6a10338d3761d506daf324a5bdd8c6018da19443f589d7775e84d78cfa5aee5a99
7
+ data.tar.gz: 448fcb8cc6a4a8c3e59fd8ea13dfcf2824bd2d51c796c531c5c876a4ae4bd552e1ab694b73dcce1e03132ac5884185d2712232ccd3c6709663cc1e49428afab9
data/.travis.yml CHANGED
@@ -8,7 +8,8 @@ rvm:
8
8
  - 1.8.7
9
9
  - 1.9.2
10
10
  - 1.9.3
11
- - 2.0.0
11
+ - 2.0.0
12
+ - 2.1.0
12
13
  - ruby-head
13
14
  - jruby-18mode
14
15
  - jruby-19mode
@@ -25,6 +26,8 @@ matrix:
25
26
  gemfile: Gemfile.1.8.7
26
27
  - rvm: 2.0.0
27
28
  gemfile: Gemfile.1.8.7
29
+ - rvm: 2.1.0
30
+ gemfile: Gemfile.1.8.7
28
31
  - rvm: ruby-head
29
32
  gemfile: Gemfile.1.8.7
30
33
  - rvm: jruby-18mode
@@ -39,6 +42,9 @@ matrix:
39
42
  allow_failures:
40
43
  - rvm: rbx-2
41
44
 
45
+ before_install:
46
+ - gem install bundler -v '= 1.5.1'
47
+
42
48
  # script: bundle exec rspec spec
43
49
  env:
44
50
  global:
data/CHANGELOG CHANGED
@@ -1,9 +1,18 @@
1
+ 2.6.5 (01/07/2014)
2
+
3
+ Bug Fixes:
4
+ =========
5
+
6
+ [base] Update instance name for DigitalOcean: Ubuntu 12.04.3 x64. <0d57e12>
7
+ [core] Fix vagrant 1.4.x sending array of ssh keys. <70fe6b6>
8
+
9
+
1
10
  2.6.4 (12/23/2013)
2
11
 
3
12
  Improvements:
4
13
  ============
5
14
 
6
- [base] Upgraded ruby-build from 20131122.1 to 20131220.1. <c869c00>
15
+ [base] Upgraded ruby-build from 20131122.1 to 20131220.1. <c869c00>
7
16
  [base] Upgraded default ruby from 1.9.3-p448 to 1.9.3-p484. <d843c0c>
8
17
 
9
18
  Bug Fixes:
data/lib/rubber/recipes/rubber.rb CHANGED
@@ -46,7 +46,7 @@ namespace :rubber do
46
46
  top.roles[r] ||= []
47
47
  end
48
48
  end
49
-
49
+
50
50
  if find_servers_for_task(current_task).empty?
51
51
  logger.info "No servers for task #{name}, skipping"
52
52
  next
@@ -59,7 +59,7 @@ namespace :rubber do
59
59
 
60
60
  allow_optional_tasks(self)
61
61
  on :load, "rubber:init"
62
-
62
+
63
63
  required_task :init do
64
64
  set :rubber_cfg, Rubber::Configuration.get_configuration(Rubber.env)
65
65
  set :rubber_env, rubber_cfg.environment.bind()
@@ -84,7 +84,14 @@ namespace :rubber do
84
84
  # the private key in the same folder, the public key should have the
85
85
  # extension ".pub".
86
86
 
87
- ssh_options[:keys] = [ENV['RUBBER_SSH_KEY'] || cloud.env.key_file].flatten.compact
87
+ #ssh keys could be multiple, even from ENV. This is comma separated.
88
+ ssh_keys = if ENV['RUBBER_SSH_KEY']
89
+ ENV['RUBBER_SSH_KEY'].split(',')
90
+ else
91
+ cloud.env.key_file
92
+ end
93
+
94
+ ssh_options[:keys] = [ssh_keys].flatten.compact
88
95
  ssh_options[:timeout] = fetch(:ssh_timeout, 5)
89
96
  end
90
97
 
data/lib/rubber/vagrant/provisioner.rb CHANGED
@@ -29,14 +29,19 @@ module VagrantPlugins
29
29
 
30
30
  private
31
31
 
32
+ #comma separated ssh keys for rubber.
33
+ def rubber_ssh_keys
34
+ Array(ssh_info[:private_key_path]).join(',')
35
+ end
36
+
32
37
  def create
33
38
  if config.use_vagrant_ruby
34
- script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} #{internal_cap_command} rubber:create -S initial_ssh_user=#{ssh_info[:username]}"
39
+ script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{rubber_ssh_keys} #{internal_cap_command} rubber:create -S initial_ssh_user=#{ssh_info[:username]}"
35
40
  else
36
41
  script = <<-ENDSCRIPT
37
42
  unset GEM_HOME;
38
43
  unset GEM_PATH;
39
- PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c '#{rvm_prefix} bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
44
+ PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{rubber_ssh_keys} bash -c '#{rvm_prefix} bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
40
45
  ENDSCRIPT
41
46
  end
42
47
 
@@ -59,12 +64,12 @@ module VagrantPlugins
59
64
 
60
65
  def refresh
61
66
  if config.use_vagrant_ruby
62
- script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} #{internal_cap_command} rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}"
67
+ script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} #{internal_cap_command} rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}"
63
68
  else
64
69
  script = <<-ENDSCRIPT
65
70
  unset GEM_HOME;
66
71
  unset GEM_PATH;
67
- PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c '#{rvm_prefix} bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
72
+ PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c '#{rvm_prefix} bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
68
73
  ENDSCRIPT
69
74
  end
70
75
 
@@ -73,12 +78,12 @@ module VagrantPlugins
73
78
 
74
79
  def bootstrap
75
80
  if config.use_vagrant_ruby
76
- script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} #{internal_cap_command} rubber:bootstrap"
81
+ script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} #{internal_cap_command} rubber:bootstrap"
77
82
  else
78
83
  script = <<-ENDSCRIPT
79
84
  unset GEM_HOME;
80
85
  unset GEM_PATH;
81
- PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:bootstrap'
86
+ PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:bootstrap'
82
87
  ENDSCRIPT
83
88
  end
84
89
 
@@ -87,12 +92,12 @@ module VagrantPlugins
87
92
 
88
93
  def deploy_migrations
89
94
  if config.use_vagrant_ruby
90
- script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} #{internal_cap_command} deploy:migrations"
95
+ script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} #{internal_cap_command} deploy:migrations"
91
96
  else
92
97
  script = <<-ENDSCRIPT
93
98
  unset GEM_HOME;
94
99
  unset GEM_PATH;
95
- PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap deploy:migrations'
100
+ PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap deploy:migrations'
96
101
  ENDSCRIPT
97
102
  end
98
103
 
data/lib/rubber/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rubber
2
- VERSION = "2.6.4"
2
+ VERSION = "2.6.5"
3
3
  end
data/templates/base/config/rubber/rubber.yml CHANGED
@@ -113,7 +113,7 @@ cloud_providers:
113
113
  region: New York 1
114
114
 
115
115
  # REQUIRED: The image name and type for creating instances.
116
- image_id: Ubuntu 12.04 x64
116
+ image_id: Ubuntu 12.04.3 x64
117
117
  image_type: 512MB
118
118
 
119
119
  # Use an alternate cloud provider supported by fog. This doesn't fully work
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubber
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.4
4
+ version: 2.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Conway
@@ -9,174 +9,174 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-12-24 00:00:00.000000000 Z
12
+ date: 2014-01-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '2.12'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '2.12'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: net-ssh
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: '2.6'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: '2.6'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: thor
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - '>='
46
+ - - ">="
47
47
  - !ruby/object:Gem::Version
48
48
  version: '0'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - '>='
53
+ - - ">="
54
54
  - !ruby/object:Gem::Version
55
55
  version: '0'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: clamp
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - '>='
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: '0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - '>='
67
+ - - ">="
68
68
  - !ruby/object:Gem::Version
69
69
  version: '0'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: open4
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - '>='
74
+ - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - '>='
81
+ - - ">="
82
82
  - !ruby/object:Gem::Version
83
83
  version: '0'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: fog
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - ~>
88
+ - - "~>"
89
89
  - !ruby/object:Gem::Version
90
90
  version: '1.6'
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - ~>
95
+ - - "~>"
96
96
  - !ruby/object:Gem::Version
97
97
  version: '1.6'
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: json
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - '>='
102
+ - - ">="
103
103
  - !ruby/object:Gem::Version
104
104
  version: '0'
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - '>='
109
+ - - ">="
110
110
  - !ruby/object:Gem::Version
111
111
  version: '0'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: rake
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - '>='
116
+ - - ">="
117
117
  - !ruby/object:Gem::Version
118
118
  version: '0'
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - '>='
123
+ - - ">="
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: test-unit
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - '>='
130
+ - - ">="
131
131
  - !ruby/object:Gem::Version
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - '>='
137
+ - - ">="
138
138
  - !ruby/object:Gem::Version
139
139
  version: '0'
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: shoulda-context
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - '>='
144
+ - - ">="
145
145
  - !ruby/object:Gem::Version
146
146
  version: '0'
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: '0'
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: mocha
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - '>='
158
+ - - ">="
159
159
  - !ruby/object:Gem::Version
160
160
  version: '0'
161
161
  type: :development
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - '>='
165
+ - - ">="
166
166
  - !ruby/object:Gem::Version
167
167
  version: '0'
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: awesome_print
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - '>='
172
+ - - ">="
173
173
  - !ruby/object:Gem::Version
174
174
  version: '0'
175
175
  type: :development
176
176
  prerelease: false
177
177
  version_requirements: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - '>='
179
+ - - ">="
180
180
  - !ruby/object:Gem::Version
181
181
  version: '0'
182
182
  description: |2
@@ -194,8 +194,8 @@ executables:
194
194
  extensions: []
195
195
  extra_rdoc_files: []
196
196
  files:
197
- - .gitignore
198
- - .travis.yml
197
+ - ".gitignore"
198
+ - ".travis.yml"
199
199
  - CHANGELOG
200
200
  - Gemfile
201
201
  - Gemfile.1.8.7
@@ -681,17 +681,17 @@ require_paths:
681
681
  - lib
682
682
  required_ruby_version: !ruby/object:Gem::Requirement
683
683
  requirements:
684
- - - '>='
684
+ - - ">="
685
685
  - !ruby/object:Gem::Version
686
686
  version: '0'
687
687
  required_rubygems_version: !ruby/object:Gem::Requirement
688
688
  requirements:
689
- - - '>='
689
+ - - ">="
690
690
  - !ruby/object:Gem::Version
691
691
  version: '0'
692
692
  requirements: []
693
693
  rubyforge_project: rubber
694
- rubygems_version: 2.1.7
694
+ rubygems_version: 2.2.0
695
695
  signing_key:
696
696
  specification_version: 4
697
697
  summary: A capistrano plugin for managing multi-instance deployments to the cloud