engineyard-serverside 2.1.0.pre → 2.1.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
@@ -98,8 +98,8 @@ module EY
98
98
  init_and_propagate(integrate_options, 'integrate') do |servers, config, shell|
99
99
 
100
100
  # We have to rsync the entire app dir, so we need all the permissions to be correct!
101
- rsync_command = "find #{app_dir} -not -user #{config.user} -or -not -group #{config.group} -exec chown #{config.user}:#{config.group} {} +"
102
- shell.logged_system "sudo sh -l -c '#{rsync_command}'"
101
+ chown_command = "find #{app_dir} -not -user #{config.user} -or -not -group #{config.group} -exec chown #{config.user}:#{config.group} {} +"
102
+ shell.logged_system "sudo sh -l -c '#{chown_command}'"
103
103
 
104
104
  servers.each do |server|
105
105
  shell.logged_system server.sync_directory_command(app_dir)
@@ -34,10 +34,10 @@ module EY
34
34
  end
35
35
 
36
36
  def reuse
37
- run("mkdir -p #{paths.public_assets} && rsync -aq #{previous_assets_path}/ #{paths.public_assets}")
37
+ run "mkdir -p #{paths.public_assets} && rsync -aq #{previous_assets_path}/ #{paths.public_assets}"
38
38
  end
39
39
 
40
- # ?ink the previous assets into the new public/last_assets/assets
40
+ # link the previous assets into the new public/last_assets/assets
41
41
  # to prevent missing assets during deploy.
42
42
  #
43
43
  # This results in the directory structure:
@@ -51,7 +51,7 @@ module EY
51
51
  protected
52
52
 
53
53
  def run(cmd)
54
- runner.run(cmd)
54
+ runner.run cmd
55
55
  end
56
56
 
57
57
  def previous_assets_path
@@ -35,6 +35,9 @@ module EY
35
35
 
36
36
  # a nice info outputter that prepends spermy operators for some reason.
37
37
  def status(msg)
38
+ if msg.respond_to?(:force_encoding)
39
+ msg.force_encoding("UTF-8")
40
+ end
38
41
  info msg.gsub(/^/, '~> ')
39
42
  end
40
43
 
@@ -1,5 +1,5 @@
1
1
  module EY
2
2
  module Serverside
3
- VERSION = '2.1.0.pre'
3
+ VERSION = '2.1.0.rc1'
4
4
  end
5
5
  end
data/spec/shell_spec.rb CHANGED
@@ -3,6 +3,14 @@ require 'tempfile'
3
3
  require 'timecop'
4
4
 
5
5
  describe EY::Serverside::Shell do
6
+ if "".respond_to?(:force_encoding)
7
+ it "status works for ut8" do
8
+ output = StringIO.new
9
+ shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => Time.local(2008, 9, 1, 12, 10, 25))
10
+ shell.status("\u2603".force_encoding("binary"))
11
+ end
12
+ end
13
+
6
14
  it "has a timestamp before each line" do
7
15
  time1 = Time.local(2008, 9, 1, 12, 0, 0)
8
16
  time2 = Time.local(2008, 9, 1, 12, 3, 5)
metadata CHANGED
@@ -1,157 +1,161 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: engineyard-serverside
3
- version: !ruby/object:Gem::Version
4
- version: 2.1.0.pre
3
+ version: !ruby/object:Gem::Version
4
+ hash: -1776706772
5
5
  prerelease: 6
6
+ segments:
7
+ - 2
8
+ - 1
9
+ - 0
10
+ - rc
11
+ - 1
12
+ version: 2.1.0.rc1
6
13
  platform: ruby
7
- authors:
14
+ authors:
8
15
  - EY Cloud Team
9
16
  autorequire:
10
17
  bindir: bin
11
18
  cert_chain: []
12
- date: 2013-04-12 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
19
+
20
+ date: 2013-05-17 00:00:00 Z
21
+ dependencies:
22
+ - !ruby/object:Gem::Dependency
15
23
  name: rspec
16
- requirement: !ruby/object:Gem::Requirement
17
- none: false
18
- requirements:
19
- - - '='
20
- - !ruby/object:Gem::Version
21
- version: 1.3.2
22
- type: :development
23
24
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
+ requirement: &id001 !ruby/object:Gem::Requirement
25
26
  none: false
26
- requirements:
27
- - - '='
28
- - !ruby/object:Gem::Version
27
+ requirements:
28
+ - - "="
29
+ - !ruby/object:Gem::Version
30
+ hash: 31
31
+ segments:
32
+ - 1
33
+ - 3
34
+ - 2
29
35
  version: 1.3.2
30
- - !ruby/object:Gem::Dependency
31
- name: rake
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
- requirements:
35
- - - ! '>='
36
- - !ruby/object:Gem::Version
37
- version: 0.9.2.2
38
- - - <
39
- - !ruby/object:Gem::Version
40
- version: '10.0'
41
36
  type: :development
37
+ version_requirements: *id001
38
+ - !ruby/object:Gem::Dependency
39
+ name: rake
42
40
  prerelease: false
43
- version_requirements: !ruby/object:Gem::Requirement
41
+ requirement: &id002 !ruby/object:Gem::Requirement
44
42
  none: false
45
- requirements:
46
- - - ! '>='
47
- - !ruby/object:Gem::Version
43
+ requirements:
44
+ - - ">="
45
+ - !ruby/object:Gem::Version
46
+ hash: 11
47
+ segments:
48
+ - 0
49
+ - 9
50
+ - 2
51
+ - 2
48
52
  version: 0.9.2.2
49
53
  - - <
50
- - !ruby/object:Gem::Version
51
- version: '10.0'
52
- - !ruby/object:Gem::Dependency
53
- name: rdoc
54
- requirement: !ruby/object:Gem::Requirement
55
- none: false
56
- requirements:
57
- - - ! '>='
58
- - !ruby/object:Gem::Version
59
- version: '0'
54
+ - !ruby/object:Gem::Version
55
+ hash: 35
56
+ segments:
57
+ - 10
58
+ - 0
59
+ version: "10.0"
60
60
  type: :development
61
+ version_requirements: *id002
62
+ - !ruby/object:Gem::Dependency
63
+ name: rdoc
61
64
  prerelease: false
62
- version_requirements: !ruby/object:Gem::Requirement
63
- none: false
64
- requirements:
65
- - - ! '>='
66
- - !ruby/object:Gem::Version
67
- version: '0'
68
- - !ruby/object:Gem::Dependency
69
- name: timecop
70
- requirement: !ruby/object:Gem::Requirement
65
+ requirement: &id003 !ruby/object:Gem::Requirement
71
66
  none: false
72
- requirements:
73
- - - ! '>='
74
- - !ruby/object:Gem::Version
75
- version: '0'
67
+ requirements:
68
+ - - ">="
69
+ - !ruby/object:Gem::Version
70
+ hash: 3
71
+ segments:
72
+ - 0
73
+ version: "0"
76
74
  type: :development
75
+ version_requirements: *id003
76
+ - !ruby/object:Gem::Dependency
77
+ name: timecop
77
78
  prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- none: false
80
- requirements:
81
- - - ! '>='
82
- - !ruby/object:Gem::Version
83
- version: '0'
84
- - !ruby/object:Gem::Dependency
85
- name: simplecov
86
- requirement: !ruby/object:Gem::Requirement
79
+ requirement: &id004 !ruby/object:Gem::Requirement
87
80
  none: false
88
- requirements:
89
- - - ! '>='
90
- - !ruby/object:Gem::Version
91
- version: '0'
81
+ requirements:
82
+ - - ">="
83
+ - !ruby/object:Gem::Version
84
+ hash: 3
85
+ segments:
86
+ - 0
87
+ version: "0"
92
88
  type: :development
89
+ version_requirements: *id004
90
+ - !ruby/object:Gem::Dependency
91
+ name: simplecov
93
92
  prerelease: false
94
- version_requirements: !ruby/object:Gem::Requirement
95
- none: false
96
- requirements:
97
- - - ! '>='
98
- - !ruby/object:Gem::Version
99
- version: '0'
100
- - !ruby/object:Gem::Dependency
101
- name: engineyard-cloud-client
102
- requirement: !ruby/object:Gem::Requirement
93
+ requirement: &id005 !ruby/object:Gem::Requirement
103
94
  none: false
104
- requirements:
105
- - - ~>
106
- - !ruby/object:Gem::Version
107
- version: 1.0.11
95
+ requirements:
96
+ - - ">="
97
+ - !ruby/object:Gem::Version
98
+ hash: 3
99
+ segments:
100
+ - 0
101
+ version: "0"
108
102
  type: :development
103
+ version_requirements: *id005
104
+ - !ruby/object:Gem::Dependency
105
+ name: engineyard-cloud-client
109
106
  prerelease: false
110
- version_requirements: !ruby/object:Gem::Requirement
107
+ requirement: &id006 !ruby/object:Gem::Requirement
111
108
  none: false
112
- requirements:
109
+ requirements:
113
110
  - - ~>
114
- - !ruby/object:Gem::Version
111
+ - !ruby/object:Gem::Version
112
+ hash: 1
113
+ segments:
114
+ - 1
115
+ - 0
116
+ - 11
115
117
  version: 1.0.11
116
- - !ruby/object:Gem::Dependency
117
- name: engineyard-serverside-adapter
118
- requirement: !ruby/object:Gem::Requirement
119
- none: false
120
- requirements:
121
- - - ~>
122
- - !ruby/object:Gem::Version
123
- version: 2.0.6
124
118
  type: :development
119
+ version_requirements: *id006
120
+ - !ruby/object:Gem::Dependency
121
+ name: engineyard-serverside-adapter
125
122
  prerelease: false
126
- version_requirements: !ruby/object:Gem::Requirement
123
+ requirement: &id007 !ruby/object:Gem::Requirement
127
124
  none: false
128
- requirements:
125
+ requirements:
129
126
  - - ~>
130
- - !ruby/object:Gem::Version
127
+ - !ruby/object:Gem::Version
128
+ hash: 3
129
+ segments:
130
+ - 2
131
+ - 0
132
+ - 6
131
133
  version: 2.0.6
132
- - !ruby/object:Gem::Dependency
133
- name: sqlite3
134
- requirement: !ruby/object:Gem::Requirement
135
- none: false
136
- requirements:
137
- - - ! '>='
138
- - !ruby/object:Gem::Version
139
- version: '0'
140
134
  type: :development
135
+ version_requirements: *id007
136
+ - !ruby/object:Gem::Dependency
137
+ name: sqlite3
141
138
  prerelease: false
142
- version_requirements: !ruby/object:Gem::Requirement
139
+ requirement: &id008 !ruby/object:Gem::Requirement
143
140
  none: false
144
- requirements:
145
- - - ! '>='
146
- - !ruby/object:Gem::Version
147
- version: '0'
141
+ requirements:
142
+ - - ">="
143
+ - !ruby/object:Gem::Version
144
+ hash: 3
145
+ segments:
146
+ - 0
147
+ version: "0"
148
+ type: :development
149
+ version_requirements: *id008
148
150
  description:
149
151
  email: cloud@engineyard.com
150
- executables:
152
+ executables:
151
153
  - engineyard-serverside
152
154
  extensions: []
155
+
153
156
  extra_rdoc_files: []
154
- files:
157
+
158
+ files:
155
159
  - bin/engineyard-serverside
156
160
  - lib/engineyard-serverside/about.rb
157
161
  - lib/engineyard-serverside/cli.rb
@@ -379,29 +383,40 @@ files:
379
383
  - spec/support/integration.rb
380
384
  homepage: http://github.com/engineyard/engineyard-serverside
381
385
  licenses: []
386
+
382
387
  post_install_message:
383
388
  rdoc_options: []
384
- require_paths:
389
+
390
+ require_paths:
385
391
  - lib
386
- required_ruby_version: !ruby/object:Gem::Requirement
392
+ required_ruby_version: !ruby/object:Gem::Requirement
387
393
  none: false
388
- requirements:
389
- - - ! '>='
390
- - !ruby/object:Gem::Version
391
- version: '0'
392
- required_rubygems_version: !ruby/object:Gem::Requirement
394
+ requirements:
395
+ - - ">="
396
+ - !ruby/object:Gem::Version
397
+ hash: 3
398
+ segments:
399
+ - 0
400
+ version: "0"
401
+ required_rubygems_version: !ruby/object:Gem::Requirement
393
402
  none: false
394
- requirements:
395
- - - ! '>='
396
- - !ruby/object:Gem::Version
403
+ requirements:
404
+ - - ">="
405
+ - !ruby/object:Gem::Version
406
+ hash: 23
407
+ segments:
408
+ - 1
409
+ - 3
410
+ - 6
397
411
  version: 1.3.6
398
412
  requirements: []
413
+
399
414
  rubyforge_project:
400
415
  rubygems_version: 1.8.25
401
416
  signing_key:
402
417
  specification_version: 3
403
418
  summary: A gem that deploys ruby applications on EY Cloud instances
404
- test_files:
419
+ test_files:
405
420
  - spec/basic_deploy_spec.rb
406
421
  - spec/bundler_deploy_spec.rb
407
422
  - spec/configuration_spec.rb