zenflow 0.8.3 → 0.8.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +43 -39
  3. data/VERSION.yml +1 -1
  4. data/lib/zenflow/helpers/ask.rb +8 -8
  5. data/zenflow.gemspec +1 -1
  6. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f9d8ccc7d838dd8da74652e08db81f9c90e1f7fc
4
- data.tar.gz: 6d69ea2a6f87cfccf50eaa3246ec34c0db8ad28e
3
+ metadata.gz: 8ad5dd8a33420a4b3ee33ad38fbe379aa90822a9
4
+ data.tar.gz: c24a2dd9c5dc478457d4daae3d081fb129ec69f1
5
5
  SHA512:
6
- metadata.gz: 1be8b2137b79aa83045c2bb68d03f794f7628327cd03d525d17b901c868afb61f9bbbe7ef8781973ac870ed5b7d2dd666432e0b03de259481d804ea5adf1b22e
7
- data.tar.gz: 7d5c7c29425dca685c9c5930b6b5290baae381cc0c0ba7e90ab39981195d40df2f883085978bf2874059d59fb4d26d5e36dc7e5c4288d9760253d6cc7e44e99f
6
+ metadata.gz: f1e7d76da03d863dd5ceadd994cfc70d9051ef05470043d847aa4ed0cb35ee22d634e0046cd0a362dc0ea4a8ace082e9b607c0364213fc00f0dee3d4e77c4dc0
7
+ data.tar.gz: 6f52a01b6dfd9f745b04e970bde1490940a6350033d5be14b97facc1edeb6b26a51559e23e21ec6764a6d9491fd7584f2fef32dcac8d1233a64b69662c03e8ca
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- zenflow (0.8.2)
4
+ zenflow (0.8.4)
5
5
  colored (~> 1.2)
6
- httparty (~> 0.11.0)
6
+ httparty (~> 0.12.0)
7
7
  terminal-table (~> 1.4.5)
8
8
  thor (~> 0.18.1)
9
9
 
@@ -11,81 +11,85 @@ GEM
11
11
  remote: http://rubygems.org/
12
12
  specs:
13
13
  addressable (2.3.5)
14
- coderay (1.0.9)
14
+ celluloid (0.15.2)
15
+ timers (~> 1.1.0)
16
+ coderay (1.1.0)
15
17
  colored (1.2)
16
- colorize (0.5.8)
17
18
  columnize (0.3.6)
18
- coveralls (0.6.7)
19
- colorize
19
+ coveralls (0.7.0)
20
20
  multi_json (~> 1.3)
21
21
  rest-client
22
22
  simplecov (>= 0.7)
23
+ term-ansicolor
23
24
  thor
24
- crack (0.4.0)
25
+ crack (0.4.1)
25
26
  safe_yaml (~> 0.9.0)
26
- debugger (1.6.1)
27
+ debugger (1.6.5)
27
28
  columnize (>= 0.3.1)
28
29
  debugger-linecache (~> 1.2.0)
29
- debugger-ruby_core_source (~> 1.2.3)
30
+ debugger-ruby_core_source (~> 1.3.1)
30
31
  debugger-linecache (1.2.0)
31
- debugger-ruby_core_source (1.2.3)
32
- diff-lcs (1.2.4)
33
- ffi (1.9.0)
32
+ debugger-ruby_core_source (1.3.1)
33
+ diff-lcs (1.2.5)
34
+ ffi (1.9.3)
34
35
  formatador (0.2.4)
35
36
  fuubar (1.1.1)
36
37
  rspec (~> 2.0)
37
38
  rspec-instafail (~> 0.2.0)
38
39
  ruby-progressbar (~> 1.0)
39
- guard (1.8.1)
40
+ guard (2.2.5)
40
41
  formatador (>= 0.2.4)
41
- listen (>= 1.0.0)
42
- lumberjack (>= 1.0.2)
43
- pry (>= 0.9.10)
44
- thor (>= 0.14.6)
45
- guard-rspec (3.0.2)
42
+ listen (~> 2.1)
43
+ lumberjack (~> 1.0)
44
+ pry (>= 0.9.12)
45
+ thor (>= 0.18.1)
46
+ guard-rspec (3.0.3)
46
47
  guard (>= 1.8)
47
48
  rspec (~> 2.13)
48
- httparty (0.11.0)
49
- multi_json (~> 1.0)
49
+ httparty (0.12.0)
50
+ json (~> 1.8)
50
51
  multi_xml (>= 0.5.2)
51
- listen (1.2.2)
52
+ json (1.8.1)
53
+ listen (2.4.0)
54
+ celluloid (>= 0.15.2)
52
55
  rb-fsevent (>= 0.9.3)
53
56
  rb-inotify (>= 0.9)
54
- rb-kqueue (>= 0.2)
55
57
  lumberjack (1.0.4)
56
- method_source (0.8.1)
57
- mime-types (1.23)
58
- multi_json (1.7.7)
59
- multi_xml (0.5.4)
60
- pry (0.9.12.2)
61
- coderay (~> 1.0.5)
58
+ method_source (0.8.2)
59
+ mime-types (2.0)
60
+ multi_json (1.8.4)
61
+ multi_xml (0.5.5)
62
+ pry (0.9.12.4)
63
+ coderay (~> 1.0)
62
64
  method_source (~> 0.8)
63
65
  slop (~> 3.4)
64
- rb-fsevent (0.9.3)
65
- rb-inotify (0.9.0)
66
- ffi (>= 0.5.0)
67
- rb-kqueue (0.2.0)
66
+ rb-fsevent (0.9.4)
67
+ rb-inotify (0.9.3)
68
68
  ffi (>= 0.5.0)
69
69
  rest-client (1.6.7)
70
70
  mime-types (>= 1.16)
71
- rspec (2.14.0)
71
+ rspec (2.14.1)
72
72
  rspec-core (~> 2.14.0)
73
73
  rspec-expectations (~> 2.14.0)
74
74
  rspec-mocks (~> 2.14.0)
75
- rspec-core (2.14.0)
76
- rspec-expectations (2.14.0)
75
+ rspec-core (2.14.7)
76
+ rspec-expectations (2.14.4)
77
77
  diff-lcs (>= 1.1.3, < 2.0)
78
78
  rspec-instafail (0.2.4)
79
- rspec-mocks (2.14.1)
80
- ruby-progressbar (1.1.1)
81
- safe_yaml (0.9.4)
79
+ rspec-mocks (2.14.4)
80
+ ruby-progressbar (1.4.0)
81
+ safe_yaml (0.9.7)
82
82
  simplecov (0.7.1)
83
83
  multi_json (~> 1.0)
84
84
  simplecov-html (~> 0.7.1)
85
85
  simplecov-html (0.7.1)
86
- slop (3.4.5)
86
+ slop (3.4.7)
87
+ term-ansicolor (1.2.2)
88
+ tins (~> 0.8)
87
89
  terminal-table (1.4.5)
88
90
  thor (0.18.1)
91
+ timers (1.1.0)
92
+ tins (0.13.1)
89
93
  vcr (2.5.0)
90
94
  webmock (1.13.0)
91
95
  addressable (>= 2.2.7)
data/VERSION.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  major: 0
3
3
  minor: 8
4
- patch: 3
4
+ patch: 4
5
5
  pre:
data/lib/zenflow/helpers/ask.rb CHANGED
@@ -45,14 +45,7 @@ module Zenflow
45
45
  end
46
46
 
47
47
  def self.valid_response?(response, options={})
48
- if response == ''
49
- response = options[:default].downcase if options[:default]
50
- end
51
-
52
- # The guard in the line below is required to allow branches to be named
53
- # directly on the command line and bypass the prompt for branch name
54
- response.downcase! unless options[:response]
55
-
48
+ response = normalize_response(response, options[:default])
56
49
  options[:options].map!(&:downcase) if options[:options]
57
50
 
58
51
  return false if options[:options] && !options[:options].include?(response)
@@ -71,6 +64,13 @@ module Zenflow
71
64
  end
72
65
  "-----> #{message} Try again.".red
73
66
  end
67
+
68
+ protected
69
+
70
+ def self.normalize_response(primary_response, secondary_response)
71
+ return secondary_response.downcase if primary_response.to_s == '' && !secondary_response.nil?
72
+ primary_response.downcase
73
+ end
74
74
  end
75
75
 
76
76
  end
data/zenflow.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
20
20
  s.add_dependency "thor", "~> 0.18.1"
21
21
  s.add_dependency "colored", "~> 1.2"
22
22
  s.add_dependency "terminal-table", "~> 1.4.5"
23
- s.add_dependency "httparty", "~> 0.11.0"
23
+ s.add_dependency "httparty", "~> 0.12.0"
24
24
  s.add_development_dependency('rspec', '~> 2.14')
25
25
  s.add_development_dependency('simplecov', '~> 0.7.1')
26
26
  s.add_development_dependency('debugger', '~> 1.6.1')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zenflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.3
4
+ version: 0.8.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Kittelson
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-10-04 00:00:00.000000000 Z
13
+ date: 2014-01-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor
@@ -60,14 +60,14 @@ dependencies:
60
60
  requirements:
61
61
  - - ~>
62
62
  - !ruby/object:Gem::Version
63
- version: 0.11.0
63
+ version: 0.12.0
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - ~>
69
69
  - !ruby/object:Gem::Version
70
- version: 0.11.0
70
+ version: 0.12.0
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rspec
73
73
  requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
266
266
  version: '0'
267
267
  requirements: []
268
268
  rubyforge_project:
269
- rubygems_version: 2.0.6
269
+ rubygems_version: 2.1.11
270
270
  signing_key:
271
271
  specification_version: 4
272
272
  summary: Branch management and deployment tool.