shelly 0.0.53 → 0.0.54

Sign up to get free protection for your applications and to get access to all the features.
data/lib/shelly/app.rb CHANGED
@@ -12,6 +12,10 @@ module Shelly
12
12
  self.code_name = code_name
13
13
  end
14
14
 
15
+ def databases=(dbs)
16
+ @databases = dbs - ['none']
17
+ end
18
+
15
19
  def add_git_remote
16
20
  system("git remote rm #{code_name} > /dev/null 2>&1")
17
21
  system("git remote add #{code_name} #{git_url}")
@@ -320,8 +320,7 @@ We have been notified about it. We will be adding new resources shortly}
320
320
  unless ["code-name", "databases"].all? do |option|
321
321
  options.include?(option.to_s) && options[option.to_s] != option.to_s
322
322
  end && valid_databases?(options["databases"])
323
- # FIXME: ' to `
324
- say_error "Try 'shelly help add' for more information"
323
+ say_error "Try `shelly help add` for more information"
325
324
  end
326
325
  end
327
326
  end
@@ -366,7 +365,7 @@ We have been notified about it. We will be adding new resources shortly}
366
365
  databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
367
366
  end while not valid
368
367
 
369
- databases.empty? ? ["postgresql"] : databases - ["none"]
368
+ databases.empty? ? ["postgresql"] : databases
370
369
  end
371
370
 
372
371
  def info_adding_cloudfile_to_repository
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.0.53"
2
+ VERSION = "0.0.54"
3
3
  end
@@ -36,6 +36,13 @@ describe Shelly::App do
36
36
  end
37
37
  end
38
38
 
39
+ describe "#databases=" do
40
+ it "should remove 'none' as possible database" do
41
+ @app.databases = %w{none postgresql}
42
+ @app.databases.should == ['postgresql']
43
+ end
44
+ end
45
+
39
46
  describe "#collaborations" do
40
47
  it "should fetch app's users" do
41
48
  @client.should_receive(:collaborations).with("foo-staging")
@@ -303,7 +303,7 @@ OUT
303
303
  context "command line options" do
304
304
  context "invalid params" do
305
305
  it "should show help and exit if not all options are passed" do
306
- $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
306
+ $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
307
307
  @main.options = {"code-name" => "foo"}
308
308
  lambda {
309
309
  invoke(@main, :add)
@@ -311,7 +311,7 @@ OUT
311
311
  end
312
312
 
313
313
  it "should exit if databases are not valid" do
314
- $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
314
+ $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
315
315
  @main.options = {"code-name" => "foo", "databases" => ["not existing"]}
316
316
  lambda {
317
317
  invoke(@main, :add)
@@ -373,10 +373,10 @@ OUT
373
373
 
374
374
  context "when user provided 'none' database" do
375
375
  it "shouldn't take it into account" do
376
- @app.should_receive(:databases=).with(["postgresql"])
377
376
  fake_stdin(["", "postgresql, none"]) do
378
377
  invoke(@main, :add)
379
378
  end
379
+ @app.databases.should == ['postgresql']
380
380
  end
381
381
  end
382
382
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shelly
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.53
4
+ version: 0.0.54
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-08 00:00:00.000000000 Z
12
+ date: 2012-03-13 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70355552495420 !ruby/object:Gem::Requirement
16
+ requirement: &70184900694820 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 2.8.0
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70355552495420
24
+ version_requirements: *70184900694820
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rake
27
- requirement: &70355552495000 !ruby/object:Gem::Requirement
27
+ requirement: &70184900694340 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70355552495000
35
+ version_requirements: *70184900694340
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: guard
38
- requirement: &70355552494540 !ruby/object:Gem::Requirement
38
+ requirement: &70184900693880 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70355552494540
46
+ version_requirements: *70184900693880
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: guard-rspec
49
- requirement: &70355552494120 !ruby/object:Gem::Requirement
49
+ requirement: &70184900693460 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70355552494120
57
+ version_requirements: *70184900693460
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: simplecov
60
- requirement: &70355552493700 !ruby/object:Gem::Requirement
60
+ requirement: &70184900693040 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70355552493700
68
+ version_requirements: *70184900693040
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: ruby_gntp
71
- requirement: &70355552509600 !ruby/object:Gem::Requirement
71
+ requirement: &70184900692580 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70355552509600
79
+ version_requirements: *70184900692580
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rb-fsevent
82
- requirement: &70355552509180 !ruby/object:Gem::Requirement
82
+ requirement: &70184900692100 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70355552509180
90
+ version_requirements: *70184900692100
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: fakefs
93
- requirement: &70355552508760 !ruby/object:Gem::Requirement
93
+ requirement: &70184900691620 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70355552508760
101
+ version_requirements: *70184900691620
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: fakeweb
104
- requirement: &70355552508340 !ruby/object:Gem::Requirement
104
+ requirement: &70184900691080 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70355552508340
112
+ version_requirements: *70184900691080
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: wijet-thor
115
- requirement: &70355552507840 !ruby/object:Gem::Requirement
115
+ requirement: &70184900690380 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.14.7
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70355552507840
123
+ version_requirements: *70184900690380
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rest-client
126
- requirement: &70355552507420 !ruby/object:Gem::Requirement
126
+ requirement: &70184900689600 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70355552507420
134
+ version_requirements: *70184900689600
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: json
137
- requirement: &70355552506960 !ruby/object:Gem::Requirement
137
+ requirement: &70184900689140 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70355552506960
145
+ version_requirements: *70184900689140
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: progressbar
148
- requirement: &70355552506540 !ruby/object:Gem::Requirement
148
+ requirement: &70184900688700 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70355552506540
156
+ version_requirements: *70184900688700
157
157
  description: Tool for managing applications and clouds at shellycloud.com
158
158
  email:
159
159
  - support@shellycloud.com
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
231
231
  version: '0'
232
232
  requirements: []
233
233
  rubyforge_project: shelly
234
- rubygems_version: 1.8.17
234
+ rubygems_version: 1.8.10
235
235
  signing_key:
236
236
  specification_version: 3
237
237
  summary: Shelly Cloud command line tool