boxen 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +7 -0
  2. data/boxen.gemspec +1 -1
  3. data/lib/boxen/preflight/creds.rb +9 -11
  4. data/test/boxen_preflight_creds_test.rb +1 -2
  5. metadata +126 -137
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 27abc61c0e4d62db329ccafa124c37a67526f1ec
4
+ data.tar.gz: f35bedb11781b8e030594e3650d85bb0770414bb
5
+ SHA512:
6
+ metadata.gz: 9f413c0aea5fb929ac044afee933171d163ad7a3ff6207c45c8c3807e913f469b055cc61dff36b4816df655d7f5b1b3a28e7029e6e185957b6bcb7ad6602dc19
7
+ data.tar.gz: 15a1cab0bb1e80f8f736e67e3c5d0509f87eb33e3c381928f13cc8a74bd7e6303e27d8d7545fe050a35595c05f8b0a0567302ae99905db836b742a09f8509d56
data/boxen.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |gem|
4
4
  gem.name = "boxen"
5
- gem.version = "2.0.3"
5
+ gem.version = "2.0.4"
6
6
  gem.authors = ["John Barnette", "Will Farrington"]
7
7
  gem.email = ["jbarnette@github.com", "wfarr@github.com"]
8
8
  gem.description = "Manage Mac development boxes with love (and Puppet)."
data/lib/boxen/preflight/creds.rb CHANGED
@@ -49,20 +49,18 @@ class Boxen::Preflight::Creds < Boxen::Preflight
49
49
  def get_tokens
50
50
  begin
51
51
  tmp_api.authorizations(:headers => headers)
52
- rescue Octokit::Unauthorized => e
52
+ rescue Octokit::Unauthorized
53
+ abort "Sorry, I can't auth you on GitHub.",
54
+ "Please check your credentials and teams and give it another try."
55
+ rescue Octokit::OneTimePasswordRequired
53
56
  puts
54
- if e.message =~ /OTP/
55
- if otp.nil?
56
- warn "It looks like you have two-factor auth enabled."
57
- else
58
- warn "That one time password didn't work. Let's try again."
59
- end
60
- get_otp
61
- get_tokens
57
+ if otp.nil?
58
+ warn "It looks like you have two-factor auth enabled."
62
59
  else
63
- abort "Sorry, I can't auth you on GitHub.",
64
- "Please check your credentials and teams and give it another try."
60
+ warn "That one time password didn't work. Let's try again."
65
61
  end
62
+ get_otp
63
+ get_tokens
66
64
  end
67
65
  end
68
66
 
data/test/boxen_preflight_creds_test.rb CHANGED
@@ -24,7 +24,7 @@ class BoxenPreflightCredsTest < Boxen::Test
24
24
  blank_opt = {:headers => {}}
25
25
  good_otp = {:headers => {"X-GitHub-OTP" => "123456"}}
26
26
 
27
- error = Octokit::Unauthorized.new
27
+ error = Octokit::OneTimePasswordRequired.new
28
28
  error.stubs(:message).returns("OTP")
29
29
 
30
30
  preflight.tmp_api.expects(:authorizations).with(blank_opt).raises(error)
@@ -37,5 +37,4 @@ class BoxenPreflightCredsTest < Boxen::Test
37
37
  preflight.get_tokens
38
38
  assert_equal "123456", preflight.otp
39
39
  end
40
-
41
40
  end
metadata CHANGED
@@ -1,161 +1,156 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: boxen
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 2
7
- - 0
8
- - 3
9
- version: 2.0.3
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.0.4
10
5
  platform: ruby
11
- authors:
6
+ authors:
12
7
  - John Barnette
13
8
  - Will Farrington
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-10-01 00:00:00 -05:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2013-10-18 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: ansi
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
25
- requirements:
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
26
18
  - - ~>
27
- - !ruby/object:Gem::Version
28
- segments:
29
- - 1
30
- - 4
31
- version: "1.4"
19
+ - !ruby/object:Gem::Version
20
+ version: '1.4'
32
21
  type: :runtime
33
- version_requirements: *id001
34
- - !ruby/object:Gem::Dependency
35
- name: hiera
36
22
  prerelease: false
37
- requirement: &id002 !ruby/object:Gem::Requirement
38
- requirements:
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ~>
26
+ - !ruby/object:Gem::Version
27
+ version: '1.4'
28
+ - !ruby/object:Gem::Dependency
29
+ name: hiera
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
39
32
  - - ~>
40
- - !ruby/object:Gem::Version
41
- segments:
42
- - 1
43
- - 0
44
- version: "1.0"
33
+ - !ruby/object:Gem::Version
34
+ version: '1.0'
45
35
  type: :runtime
46
- version_requirements: *id002
47
- - !ruby/object:Gem::Dependency
48
- name: highline
49
36
  prerelease: false
50
- requirement: &id003 !ruby/object:Gem::Requirement
51
- requirements:
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ~>
40
+ - !ruby/object:Gem::Version
41
+ version: '1.0'
42
+ - !ruby/object:Gem::Dependency
43
+ name: highline
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
52
46
  - - ~>
53
- - !ruby/object:Gem::Version
54
- segments:
55
- - 1
56
- - 6
57
- version: "1.6"
47
+ - !ruby/object:Gem::Version
48
+ version: '1.6'
58
49
  type: :runtime
59
- version_requirements: *id003
60
- - !ruby/object:Gem::Dependency
61
- name: json_pure
62
50
  prerelease: false
63
- requirement: &id004 !ruby/object:Gem::Requirement
64
- requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- segments:
68
- - 1
69
- - 7
70
- - 7
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ~>
54
+ - !ruby/object:Gem::Version
55
+ version: '1.6'
56
+ - !ruby/object:Gem::Dependency
57
+ name: json_pure
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - '>='
61
+ - !ruby/object:Gem::Version
71
62
  version: 1.7.7
72
63
  - - <
73
- - !ruby/object:Gem::Version
74
- segments:
75
- - 2
76
- - 0
77
- version: "2.0"
64
+ - !ruby/object:Gem::Version
65
+ version: '2.0'
78
66
  type: :runtime
79
- version_requirements: *id004
80
- - !ruby/object:Gem::Dependency
81
- name: librarian-puppet
82
67
  prerelease: false
83
- requirement: &id005 !ruby/object:Gem::Requirement
84
- requirements:
68
+ version_requirements: !ruby/object:Gem::Requirement
69
+ requirements:
70
+ - - '>='
71
+ - !ruby/object:Gem::Version
72
+ version: 1.7.7
73
+ - - <
74
+ - !ruby/object:Gem::Version
75
+ version: '2.0'
76
+ - !ruby/object:Gem::Dependency
77
+ name: librarian-puppet
78
+ requirement: !ruby/object:Gem::Requirement
79
+ requirements:
85
80
  - - ~>
86
- - !ruby/object:Gem::Version
87
- segments:
88
- - 0
89
- - 9
90
- - 9
81
+ - !ruby/object:Gem::Version
91
82
  version: 0.9.9
92
83
  type: :runtime
93
- version_requirements: *id005
94
- - !ruby/object:Gem::Dependency
95
- name: octokit
96
84
  prerelease: false
97
- requirement: &id006 !ruby/object:Gem::Requirement
98
- requirements:
85
+ version_requirements: !ruby/object:Gem::Requirement
86
+ requirements:
99
87
  - - ~>
100
- - !ruby/object:Gem::Version
101
- segments:
102
- - 2
103
- - 3
104
- - 0
88
+ - !ruby/object:Gem::Version
89
+ version: 0.9.9
90
+ - !ruby/object:Gem::Dependency
91
+ name: octokit
92
+ requirement: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
105
96
  version: 2.3.0
106
97
  type: :runtime
107
- version_requirements: *id006
108
- - !ruby/object:Gem::Dependency
109
- name: puppet
110
98
  prerelease: false
111
- requirement: &id007 !ruby/object:Gem::Requirement
112
- requirements:
99
+ version_requirements: !ruby/object:Gem::Requirement
100
+ requirements:
113
101
  - - ~>
114
- - !ruby/object:Gem::Version
115
- segments:
116
- - 3
117
- - 0
118
- version: "3.0"
102
+ - !ruby/object:Gem::Version
103
+ version: 2.3.0
104
+ - !ruby/object:Gem::Dependency
105
+ name: puppet
106
+ requirement: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ~>
109
+ - !ruby/object:Gem::Version
110
+ version: '3.0'
119
111
  type: :runtime
120
- version_requirements: *id007
121
- - !ruby/object:Gem::Dependency
122
- name: minitest
123
112
  prerelease: false
124
- requirement: &id008 !ruby/object:Gem::Requirement
125
- requirements:
126
- - - "="
127
- - !ruby/object:Gem::Version
128
- segments:
129
- - 4
130
- - 4
131
- - 0
113
+ version_requirements: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - ~>
116
+ - !ruby/object:Gem::Version
117
+ version: '3.0'
118
+ - !ruby/object:Gem::Dependency
119
+ name: minitest
120
+ requirement: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - '='
123
+ - !ruby/object:Gem::Version
132
124
  version: 4.4.0
133
125
  type: :development
134
- version_requirements: *id008
135
- - !ruby/object:Gem::Dependency
136
- name: mocha
137
126
  prerelease: false
138
- requirement: &id009 !ruby/object:Gem::Requirement
139
- requirements:
127
+ version_requirements: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - '='
130
+ - !ruby/object:Gem::Version
131
+ version: 4.4.0
132
+ - !ruby/object:Gem::Dependency
133
+ name: mocha
134
+ requirement: !ruby/object:Gem::Requirement
135
+ requirements:
140
136
  - - ~>
141
- - !ruby/object:Gem::Version
142
- segments:
143
- - 0
144
- - 13
145
- version: "0.13"
137
+ - !ruby/object:Gem::Version
138
+ version: '0.13'
146
139
  type: :development
147
- version_requirements: *id009
140
+ prerelease: false
141
+ version_requirements: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ~>
144
+ - !ruby/object:Gem::Version
145
+ version: '0.13'
148
146
  description: Manage Mac development boxes with love (and Puppet).
149
- email:
147
+ email:
150
148
  - jbarnette@github.com
151
149
  - wfarr@github.com
152
150
  executables: []
153
-
154
151
  extensions: []
155
-
156
152
  extra_rdoc_files: []
157
-
158
- files:
153
+ files:
159
154
  - .gitignore
160
155
  - .travis.yml
161
156
  - Gemfile
@@ -221,37 +216,30 @@ files:
221
216
  - test/fixtures/repo/modules/projects/manifests/first-project.pp
222
217
  - test/fixtures/repo/modules/projects/manifests/second-project.pp
223
218
  - test/system_timer.rb
224
- has_rdoc: true
225
219
  homepage: https://github.com/boxen/boxen
226
220
  licenses: []
227
-
221
+ metadata: {}
228
222
  post_install_message:
229
223
  rdoc_options: []
230
-
231
- require_paths:
224
+ require_paths:
232
225
  - lib
233
- required_ruby_version: !ruby/object:Gem::Requirement
234
- requirements:
235
- - - ">="
236
- - !ruby/object:Gem::Version
237
- segments:
238
- - 0
239
- version: "0"
240
- required_rubygems_version: !ruby/object:Gem::Requirement
241
- requirements:
242
- - - ">="
243
- - !ruby/object:Gem::Version
244
- segments:
245
- - 0
246
- version: "0"
226
+ required_ruby_version: !ruby/object:Gem::Requirement
227
+ requirements:
228
+ - - '>='
229
+ - !ruby/object:Gem::Version
230
+ version: '0'
231
+ required_rubygems_version: !ruby/object:Gem::Requirement
232
+ requirements:
233
+ - - '>='
234
+ - !ruby/object:Gem::Version
235
+ version: '0'
247
236
  requirements: []
248
-
249
237
  rubyforge_project:
250
- rubygems_version: 1.3.6
238
+ rubygems_version: 2.0.3
251
239
  signing_key:
252
- specification_version: 3
240
+ specification_version: 4
253
241
  summary: You know, for laptops and stuff.
254
- test_files:
242
+ test_files:
255
243
  - test/boxen/test.rb
256
244
  - test/boxen_check_test.rb
257
245
  - test/boxen_checkout_test.rb
@@ -276,3 +264,4 @@ test_files:
276
264
  - test/fixtures/repo/modules/projects/manifests/first-project.pp
277
265
  - test/fixtures/repo/modules/projects/manifests/second-project.pp
278
266
  - test/system_timer.rb
267
+ has_rdoc: