shelly 0.0.51.pre → 0.0.51

Sign up to get free protection for your applications and to get access to all the features.
data/lib/shelly/app.rb CHANGED
@@ -13,16 +13,12 @@ module Shelly
13
13
  end
14
14
 
15
15
  def add_git_remote
16
- system("git remote rm #{code_name} > /dev/null 2>&1")
17
- system("git remote add #{code_name} #{git_url}")
18
- end
19
-
20
- def git_remote_exist?
21
- IO.popen("git remote").read.include?(code_name)
16
+ system("git remote rm production > /dev/null 2>&1")
17
+ system("git remote add production #{git_url}")
22
18
  end
23
19
 
24
20
  def remove_git_remote
25
- system("git remote rm #{code_name} > /dev/null 2>&1")
21
+ system("git remote rm production > /dev/null 2>&1")
26
22
  end
27
23
 
28
24
  def generate_cloudfile
@@ -106,19 +102,7 @@ module Shelly
106
102
  end
107
103
 
108
104
  def self.guess_code_name
109
- guessed = nil
110
- if Cloudfile.present?
111
- clouds = Cloudfile.new.clouds
112
- if clouds.grep(/staging/).present?
113
- guessed = "production"
114
- production_clouds = clouds.grep(/production/)
115
- production_clouds.sort.each do |cloud|
116
- cloud =~ /production(\d*)/
117
- guessed = "production#{$1.to_i+1}"
118
- end
119
- end
120
- end
121
- "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}"
105
+ File.basename(Dir.pwd)
122
106
  end
123
107
 
124
108
  def collaborations
@@ -85,14 +85,8 @@ module Shelly
85
85
  @app.domains = options["domains"] || ["#{@app.code_name}.shellyapp.com"]
86
86
  @app.create
87
87
 
88
- git_remote = @app.git_remote_exist?
89
- if !git_remote or (git_remote and yes?("Git remote #{@app} exists, overwrite (yes/no): "))
90
- say "Adding remote #{@app} #{@app.git_url}", :green
91
- @app.add_git_remote
92
- else
93
- say "You have to manually add git remote:"
94
- say "`git remote add NAME #{@app.git_url}`"
95
- end
88
+ say "Adding remote production #{@app.git_url}", :green
89
+ @app.add_git_remote
96
90
 
97
91
  say "Creating Cloudfile", :green
98
92
  @app.create_cloudfile
@@ -106,7 +100,7 @@ module Shelly
106
100
  end
107
101
 
108
102
  info_adding_cloudfile_to_repository
109
- info_deploying_to_shellycloud(@app)
103
+ info_deploying_to_shellycloud
110
104
 
111
105
  rescue Client::ValidationException => e
112
106
  e.each_error { |error| say_error error, :with_exit => false }
@@ -356,8 +350,8 @@ We have been notified about it. We will be adding new resources shortly}
356
350
  end
357
351
 
358
352
  def ask_for_code_name
359
- default_code_name = Shelly::App.guess_code_name
360
- code_name = ask("Cloud code name (#{Shelly::App.guess_code_name} - default):")
353
+ default_code_name = "#{Shelly::App.guess_code_name}-production"
354
+ code_name = ask("Cloud code name (#{default_code_name} - default):")
361
355
  code_name.blank? ? default_code_name : code_name
362
356
  end
363
357
 
@@ -381,15 +375,15 @@ We have been notified about it. We will be adding new resources shortly}
381
375
  say " git status"
382
376
  end
383
377
 
384
- def info_deploying_to_shellycloud(remote)
378
+ def info_deploying_to_shellycloud
385
379
  say_new_line
386
380
  say "When you make sure all settings are correct please issue following commands:", :green
387
381
  say " git add ."
388
382
  say ' git commit -m "Application added to Shelly Cloud"'
389
383
  say " git push"
390
384
  say_new_line
391
- say "Deploy to your cloud using:", :green
392
- say " git push #{remote} master"
385
+ say "Deploy to production using:", :green
386
+ say " git push production master"
393
387
  say_new_line
394
388
  end
395
389
  end
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.0.51.pre"
2
+ VERSION = "0.0.51"
3
3
  end
@@ -12,27 +12,8 @@ describe Shelly::App do
12
12
  end
13
13
 
14
14
  describe ".guess_code_name" do
15
- context "no Cloudfile" do
16
- it "should return name of current working directory" do
17
- Shelly::App.guess_code_name.should == "foo-staging"
18
- end
19
- end
20
-
21
- context "with Cloudfile" do
22
- it "should return production" do
23
- File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
24
- Shelly::App.guess_code_name.should == "foo-production"
25
- end
26
-
27
- it "should return production" do
28
- File.open("Cloudfile", 'w') {|f| f.write("winnie-test:\n") }
29
- Shelly::App.guess_code_name.should == "foo-staging"
30
- end
31
-
32
- it "should return productionNUMBER" do
33
- File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
34
- Shelly::App.guess_code_name.should == "foo-production1"
35
- end
15
+ it "should return name of current working directory" do
16
+ Shelly::App.guess_code_name.should == "foo"
36
17
  end
37
18
  end
38
19
 
@@ -50,24 +31,16 @@ describe Shelly::App do
50
31
  end
51
32
 
52
33
  it "should try to remove existing git remote" do
53
- @app.should_receive(:system).with("git remote rm foo-staging > /dev/null 2>&1")
34
+ @app.should_receive(:system).with("git remote rm production > /dev/null 2>&1")
54
35
  @app.add_git_remote
55
36
  end
56
37
 
57
38
  it "should add git remote with proper name and git repository" do
58
- @app.should_receive(:system).with("git remote add foo-staging git@git.shellycloud.com:foo-staging.git")
39
+ @app.should_receive(:system).with("git remote add production git@git.shellycloud.com:foo-staging.git")
59
40
  @app.add_git_remote
60
41
  end
61
42
  end
62
43
 
63
- describe "git_remote_exist" do
64
- it "should return true if git remote exist" do
65
- io = mock(:read => "origin\nfoo-staging")
66
- IO.should_receive(:popen).with("git remote").and_return(io)
67
- @app.git_remote_exist?.should be_true
68
- end
69
- end
70
-
71
44
  describe "#configs" do
72
45
  it "should get configs from client" do
73
46
  @client.should_receive(:app_configs).with("foo-staging").and_return(config_response)
@@ -274,7 +274,6 @@ OUT
274
274
  Shelly::App.stub(:new).and_return(@app)
275
275
  @client.stub(:token).and_return("abc")
276
276
  @app.stub(:attributes).and_return({"trial" => false})
277
- @app.stub(:git_remote_exist?).and_return(false)
278
277
  end
279
278
 
280
279
  # This spec tests inside_git_repository? hook
@@ -329,7 +328,7 @@ OUT
329
328
  end
330
329
 
331
330
  it "should use code name provided by user" do
332
- $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
331
+ $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
333
332
  @app.should_receive(:code_name=).with("mycodename")
334
333
  fake_stdin(["mycodename", ""]) do
335
334
  invoke(@main, :add)
@@ -338,8 +337,8 @@ OUT
338
337
 
339
338
  context "when user provided empty code name" do
340
339
  it "should use 'current_dirname-purpose' as default" do
341
- $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
342
- @app.should_receive(:code_name=).with("foo-staging")
340
+ $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
341
+ @app.should_receive(:code_name=).with("foo-production")
343
342
  fake_stdin(["", ""]) do
344
343
  invoke(@main, :add)
345
344
  end
@@ -394,7 +393,7 @@ OUT
394
393
  $stdout.should_receive(:puts).with(green "Billing information")
395
394
  $stdout.should_receive(:puts).with("Cloud created with 20 Euro credit.")
396
395
  $stdout.should_receive(:puts).with("Remember to provide billing details before trial ends.")
397
- $stdout.should_receive(:puts).with("http://example.com/apps/foo-staging/billing/edit")
396
+ $stdout.should_receive(:puts).with("http://example.com/apps/foo-production/billing/edit")
398
397
 
399
398
  fake_stdin(["", ""]) do
400
399
  invoke(@main, :add)
@@ -416,7 +415,7 @@ OUT
416
415
  @app.should_receive(:create).and_raise(exception)
417
416
  $stdout.should_receive(:puts).with("\e[31mCode name has been already taken\e[0m")
418
417
  $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your cloud\e[0m")
419
- $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql --domains=foo-staging.shellyapp.com\e[0m")
418
+ $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-production --databases=postgresql --domains=foo-production.shellyapp.com\e[0m")
420
419
  lambda {
421
420
  fake_stdin(["", ""]) do
422
421
  invoke(@main, :add)
@@ -437,39 +436,11 @@ OUT
437
436
  }.should raise_error(SystemExit)
438
437
  end
439
438
 
440
- context "git remote" do
441
- it "should add one if it doesn't exist" do
442
- $stdout.should_receive(:puts).with("\e[32mAdding remote foooo git@git.shellycloud.com:foooo.git\e[0m")
443
- @app.should_receive(:add_git_remote)
444
- fake_stdin(["foooo", ""]) do
445
- invoke(@main, :add)
446
- end
447
- end
448
-
449
- context "does exist" do
450
- before do
451
- @app.stub(:git_remote_exist?).and_return(true)
452
- end
453
-
454
- it "should ask if one exist and overwrite" do
455
- $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no): ")
456
- $stdout.should_receive(:puts).with(green "Adding remote foooo git@git.shellycloud.com:foooo.git")
457
- @app.should_receive(:add_git_remote)
458
- fake_stdin(["foooo", "", "yes"]) do
459
- invoke(@main, :add)
460
- end
461
- end
462
-
463
- it "should ask if one exist and not overwrite" do
464
- $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no): ")
465
- $stdout.should_receive(:puts).with("You have to manually add git remote:")
466
- $stdout.should_receive(:puts).with("`git remote add NAME git@git.shellycloud.com:foooo.git`")
467
- @app.should_not_receive(:add_git_remote)
468
- fake_stdin(["foooo", "", "no"]) do
469
- invoke(@main, :add)
470
- end
471
- end
472
-
439
+ it "should add git remote" do
440
+ $stdout.should_receive(:puts).with("\e[32mAdding remote production git@git.shellycloud.com:foooo.git\e[0m")
441
+ @app.should_receive(:add_git_remote)
442
+ fake_stdin(["foooo", ""]) do
443
+ invoke(@main, :add)
473
444
  end
474
445
  end
475
446
 
@@ -495,8 +466,8 @@ OUT
495
466
  $stdout.should_receive(:puts).with(" git add .")
496
467
  $stdout.should_receive(:puts).with(' git commit -m "Application added to Shelly Cloud"')
497
468
  $stdout.should_receive(:puts).with(" git push")
498
- $stdout.should_receive(:puts).with("\e[32mDeploy to your cloud using:\e[0m")
499
- $stdout.should_receive(:puts).with(" git push foooo master")
469
+ $stdout.should_receive(:puts).with("\e[32mDeploy to production using:\e[0m")
470
+ $stdout.should_receive(:puts).with(" git push production master")
500
471
  fake_stdin(["foooo", "none"]) do
501
472
  invoke(@main, :add)
502
473
  end
metadata CHANGED
@@ -1,167 +1,190 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: shelly
3
- version: !ruby/object:Gem::Version
4
- version: 0.0.51.pre
5
- prerelease: 7
3
+ version: !ruby/object:Gem::Version
4
+ hash: 121
5
+ prerelease:
6
+ segments:
7
+ - 0
8
+ - 0
9
+ - 51
10
+ version: 0.0.51
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Shelly Cloud team
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2012-03-06 00:00:00.000000000Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: rspec
16
- requirement: &70327754642840 !ruby/object:Gem::Requirement
17
+
18
+ date: 2012-03-06 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
21
+ version_requirements: &id001 !ruby/object:Gem::Requirement
17
22
  none: false
18
- requirements:
23
+ requirements:
19
24
  - - ~>
20
- - !ruby/object:Gem::Version
25
+ - !ruby/object:Gem::Version
26
+ hash: 47
27
+ segments:
28
+ - 2
29
+ - 8
30
+ - 0
21
31
  version: 2.8.0
32
+ requirement: *id001
33
+ prerelease: false
22
34
  type: :development
35
+ name: rspec
36
+ - !ruby/object:Gem::Dependency
37
+ version_requirements: &id002 !ruby/object:Gem::Requirement
38
+ none: false
39
+ requirements:
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ hash: 3
43
+ segments:
44
+ - 0
45
+ version: "0"
46
+ requirement: *id002
23
47
  prerelease: false
24
- version_requirements: *70327754642840
25
- - !ruby/object:Gem::Dependency
48
+ type: :development
26
49
  name: rake
27
- requirement: &70327754642400 !ruby/object:Gem::Requirement
50
+ - !ruby/object:Gem::Dependency
51
+ version_requirements: &id003 !ruby/object:Gem::Requirement
28
52
  none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: '0'
33
- type: :development
53
+ requirements:
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
56
+ hash: 3
57
+ segments:
58
+ - 0
59
+ version: "0"
60
+ requirement: *id003
34
61
  prerelease: false
35
- version_requirements: *70327754642400
36
- - !ruby/object:Gem::Dependency
62
+ type: :development
37
63
  name: guard
38
- requirement: &70327754641780 !ruby/object:Gem::Requirement
64
+ - !ruby/object:Gem::Dependency
65
+ version_requirements: &id004 !ruby/object:Gem::Requirement
39
66
  none: false
40
- requirements:
41
- - - ! '>='
42
- - !ruby/object:Gem::Version
43
- version: '0'
44
- type: :development
67
+ requirements:
68
+ - - ">="
69
+ - !ruby/object:Gem::Version
70
+ hash: 3
71
+ segments:
72
+ - 0
73
+ version: "0"
74
+ requirement: *id004
45
75
  prerelease: false
46
- version_requirements: *70327754641780
47
- - !ruby/object:Gem::Dependency
76
+ type: :development
48
77
  name: guard-rspec
49
- requirement: &70327754641280 !ruby/object:Gem::Requirement
78
+ - !ruby/object:Gem::Dependency
79
+ version_requirements: &id005 !ruby/object:Gem::Requirement
50
80
  none: false
51
- requirements:
52
- - - ! '>='
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- type: :development
81
+ requirements:
82
+ - - ">="
83
+ - !ruby/object:Gem::Version
84
+ hash: 3
85
+ segments:
86
+ - 0
87
+ version: "0"
88
+ requirement: *id005
56
89
  prerelease: false
57
- version_requirements: *70327754641280
58
- - !ruby/object:Gem::Dependency
59
- name: simplecov
60
- requirement: &70327754640620 !ruby/object:Gem::Requirement
61
- none: false
62
- requirements:
63
- - - ! '>='
64
- - !ruby/object:Gem::Version
65
- version: '0'
66
90
  type: :development
67
- prerelease: false
68
- version_requirements: *70327754640620
69
- - !ruby/object:Gem::Dependency
70
- name: ruby_gntp
71
- requirement: &70327754639900 !ruby/object:Gem::Requirement
91
+ name: simplecov
92
+ - !ruby/object:Gem::Dependency
93
+ version_requirements: &id006 !ruby/object:Gem::Requirement
72
94
  none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
77
- type: :development
95
+ requirements:
96
+ - - ">="
97
+ - !ruby/object:Gem::Version
98
+ hash: 3
99
+ segments:
100
+ - 0
101
+ version: "0"
102
+ requirement: *id006
78
103
  prerelease: false
79
- version_requirements: *70327754639900
80
- - !ruby/object:Gem::Dependency
81
- name: rb-fsevent
82
- requirement: &70327754639480 !ruby/object:Gem::Requirement
83
- none: false
84
- requirements:
85
- - - ! '>='
86
- - !ruby/object:Gem::Version
87
- version: '0'
88
104
  type: :development
89
- prerelease: false
90
- version_requirements: *70327754639480
91
- - !ruby/object:Gem::Dependency
92
105
  name: fakefs
93
- requirement: &70327754639020 !ruby/object:Gem::Requirement
106
+ - !ruby/object:Gem::Dependency
107
+ version_requirements: &id007 !ruby/object:Gem::Requirement
94
108
  none: false
95
- requirements:
96
- - - ! '>='
97
- - !ruby/object:Gem::Version
98
- version: '0'
99
- type: :development
109
+ requirements:
110
+ - - ">="
111
+ - !ruby/object:Gem::Version
112
+ hash: 3
113
+ segments:
114
+ - 0
115
+ version: "0"
116
+ requirement: *id007
100
117
  prerelease: false
101
- version_requirements: *70327754639020
102
- - !ruby/object:Gem::Dependency
103
- name: fakeweb
104
- requirement: &70327754638500 !ruby/object:Gem::Requirement
105
- none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
109
- version: '0'
110
118
  type: :development
111
- prerelease: false
112
- version_requirements: *70327754638500
113
- - !ruby/object:Gem::Dependency
114
- name: wijet-thor
115
- requirement: &70327754637860 !ruby/object:Gem::Requirement
119
+ name: fakeweb
120
+ - !ruby/object:Gem::Dependency
121
+ version_requirements: &id008 !ruby/object:Gem::Requirement
116
122
  none: false
117
- requirements:
123
+ requirements:
118
124
  - - ~>
119
- - !ruby/object:Gem::Version
125
+ - !ruby/object:Gem::Version
126
+ hash: 41
127
+ segments:
128
+ - 0
129
+ - 14
130
+ - 7
120
131
  version: 0.14.7
132
+ requirement: *id008
133
+ prerelease: false
121
134
  type: :runtime
135
+ name: wijet-thor
136
+ - !ruby/object:Gem::Dependency
137
+ version_requirements: &id009 !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ">="
141
+ - !ruby/object:Gem::Version
142
+ hash: 3
143
+ segments:
144
+ - 0
145
+ version: "0"
146
+ requirement: *id009
122
147
  prerelease: false
123
- version_requirements: *70327754637860
124
- - !ruby/object:Gem::Dependency
148
+ type: :runtime
125
149
  name: rest-client
126
- requirement: &70327754636900 !ruby/object:Gem::Requirement
150
+ - !ruby/object:Gem::Dependency
151
+ version_requirements: &id010 !ruby/object:Gem::Requirement
127
152
  none: false
128
- requirements:
129
- - - ! '>='
130
- - !ruby/object:Gem::Version
131
- version: '0'
132
- type: :runtime
153
+ requirements:
154
+ - - ">="
155
+ - !ruby/object:Gem::Version
156
+ hash: 3
157
+ segments:
158
+ - 0
159
+ version: "0"
160
+ requirement: *id010
133
161
  prerelease: false
134
- version_requirements: *70327754636900
135
- - !ruby/object:Gem::Dependency
162
+ type: :runtime
136
163
  name: json
137
- requirement: &70327754636400 !ruby/object:Gem::Requirement
164
+ - !ruby/object:Gem::Dependency
165
+ version_requirements: &id011 !ruby/object:Gem::Requirement
138
166
  none: false
139
- requirements:
140
- - - ! '>='
141
- - !ruby/object:Gem::Version
142
- version: '0'
143
- type: :runtime
167
+ requirements:
168
+ - - ">="
169
+ - !ruby/object:Gem::Version
170
+ hash: 3
171
+ segments:
172
+ - 0
173
+ version: "0"
174
+ requirement: *id011
144
175
  prerelease: false
145
- version_requirements: *70327754636400
146
- - !ruby/object:Gem::Dependency
147
- name: progressbar
148
- requirement: &70327754635980 !ruby/object:Gem::Requirement
149
- none: false
150
- requirements:
151
- - - ! '>='
152
- - !ruby/object:Gem::Version
153
- version: '0'
154
176
  type: :runtime
155
- prerelease: false
156
- version_requirements: *70327754635980
177
+ name: progressbar
157
178
  description: Tool for managing applications and clouds at shellycloud.com
158
- email:
179
+ email:
159
180
  - support@shellycloud.com
160
- executables:
181
+ executables:
161
182
  - shelly
162
183
  extensions: []
184
+
163
185
  extra_rdoc_files: []
164
- files:
186
+
187
+ files:
165
188
  - .gitignore
166
189
  - .travis.yml
167
190
  - Gemfile
@@ -213,43 +236,36 @@ files:
213
236
  - spec/thor/options_spec.rb
214
237
  homepage: http://shellycloud.com
215
238
  licenses: []
239
+
216
240
  post_install_message:
217
241
  rdoc_options: []
218
- require_paths:
242
+
243
+ require_paths:
219
244
  - lib
220
- required_ruby_version: !ruby/object:Gem::Requirement
245
+ required_ruby_version: !ruby/object:Gem::Requirement
221
246
  none: false
222
- requirements:
223
- - - ! '>='
224
- - !ruby/object:Gem::Version
225
- version: '0'
226
- required_rubygems_version: !ruby/object:Gem::Requirement
247
+ requirements:
248
+ - - ">="
249
+ - !ruby/object:Gem::Version
250
+ hash: 3
251
+ segments:
252
+ - 0
253
+ version: "0"
254
+ required_rubygems_version: !ruby/object:Gem::Requirement
227
255
  none: false
228
- requirements:
229
- - - ! '>'
230
- - !ruby/object:Gem::Version
231
- version: 1.3.1
256
+ requirements:
257
+ - - ">="
258
+ - !ruby/object:Gem::Version
259
+ hash: 3
260
+ segments:
261
+ - 0
262
+ version: "0"
232
263
  requirements: []
264
+
233
265
  rubyforge_project: shelly
234
266
  rubygems_version: 1.8.10
235
267
  signing_key:
236
268
  specification_version: 3
237
269
  summary: Shelly Cloud command line tool
238
- test_files:
239
- - spec/helpers.rb
240
- - spec/input_faker.rb
241
- - spec/shelly/app_spec.rb
242
- - spec/shelly/backup_spec.rb
243
- - spec/shelly/cli/backup_spec.rb
244
- - spec/shelly/cli/config_spec.rb
245
- - spec/shelly/cli/deploys_spec.rb
246
- - spec/shelly/cli/main_spec.rb
247
- - spec/shelly/cli/runner_spec.rb
248
- - spec/shelly/cli/user_spec.rb
249
- - spec/shelly/client_spec.rb
250
- - spec/shelly/cloudfile_spec.rb
251
- - spec/shelly/download_progress_bar_spec.rb
252
- - spec/shelly/model_spec.rb
253
- - spec/shelly/user_spec.rb
254
- - spec/spec_helper.rb
255
- - spec/thor/options_spec.rb
270
+ test_files: []
271
+