marionetta 0.3.3 → 0.3.4

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -34,6 +34,15 @@ task(:publish => :gem) do
34
34
  system(cmd.join(' && '))
35
35
  end
36
36
 
37
+ task(:docs) do
38
+ docs_cmd = [
39
+ 'rm -rf docs',
40
+ 'cd lib',
41
+ 'rocco -o ../docs -l ruby marionetta.rb',
42
+ ]
43
+ system(docs_cmd.join(' && '))
44
+ end
45
+
37
46
  task(:clean) do
38
47
  system('rm *.gem')
39
48
  end
@@ -28,8 +28,13 @@ module Marionetta
28
28
 
29
29
  release = timestamp
30
30
  create_tmp_release_dir(release)
31
- send_tmp_release_dir_as_archive(release)
32
- extract_archive_into_release_dir(release)
31
+
32
+ cmd.ssh("mkdir -p #{release_dir}")
33
+
34
+ unless cmd.put(tmp_release_dir(release), release_dir)
35
+ fatal('Could not rsync release')
36
+ end
37
+
33
38
  symlink_release_dir(release)
34
39
 
35
40
  run_script(:after)
@@ -122,24 +127,6 @@ module Marionetta
122
127
  end
123
128
  end
124
129
 
125
- def send_tmp_release_dir_as_archive(release)
126
- release_archive = tmp_release_archive(release)
127
-
128
- unless cmd.archive(tmp_release_dir(release), release_archive)
129
- fatal('Could not create archive')
130
- end
131
-
132
- cmd.put(release_archive)
133
- end
134
-
135
- def extract_archive_into_release_dir(release)
136
- release_archive = tmp_release_archive(release)
137
-
138
- unless cmd.ssh_extract(release_archive, release_dir)
139
- fatal('Could not extract archive')
140
- end
141
- end
142
-
143
130
  def symlink_release_dir(release)
144
131
  release_dir = release_dir(release)
145
132
 
data/lib/marionetta.rb CHANGED
@@ -24,7 +24,9 @@
24
24
  # [author]: http://lukemorton.co.uk
25
25
  # [github]: https://github.com/DrPheltRight/marionetta
26
26
  module Marionetta
27
- VERSION = '0.3.3'
27
+ VERSION = '0.3.4'
28
+
29
+ ### Defining Servers
28
30
 
29
31
  # In order to connect to servers you must define configs for
30
32
  # each. This method provides a default map describing some
@@ -49,7 +51,7 @@ module Marionetta
49
51
 
50
52
  :rsync => {
51
53
  :command => 'rsync',
52
- :flags => ['-azP', '--delete'],
54
+ :flags => ['-azhP', '--delete'],
53
55
  },
54
56
 
55
57
  :archive => {
@@ -63,6 +65,8 @@ module Marionetta
63
65
  :flags => ['-xv'],
64
66
  },
65
67
 
68
+ :puppet => {},
69
+
66
70
  :deployer => {},
67
71
 
68
72
  :debloyer => {
data/marionetta.gemspec CHANGED
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
13
13
  also deploy your application code (with rollbacks) via
14
14
  rsync. With a RakeHelper you can integrate it into your
15
15
  workflow with ease."
16
-
16
+
17
17
  s.files = `git ls-files`.split("\n")
18
18
  s.test_files = `git ls-files -- spec/*`.split("\n")
19
19
  s.executables = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f)}
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
27
27
  s.add_development_dependency('rake')
28
28
  s.add_development_dependency('rspec')
29
29
  s.add_development_dependency('vagrant')
30
+ s.add_development_dependency('fl-rocco')
30
31
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marionetta
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.3
4
+ version: 0.3.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-19 00:00:00.000000000 Z
12
+ date: 2012-09-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: open4
@@ -107,6 +107,22 @@ dependencies:
107
107
  - - ! '>='
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0'
110
+ - !ruby/object:Gem::Dependency
111
+ name: fl-rocco
112
+ requirement: !ruby/object:Gem::Requirement
113
+ none: false
114
+ requirements:
115
+ - - ! '>='
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :development
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
110
126
  description: ! "Marionetta is a ruby library for executing commands to one\n or
111
127
  more remote machines via SSH. It provides puppet\n provisioning
112
128
  without the need for a puppet master and can\n also deploy your