itamae 1.0.0.beta34 → 1.0.0.beta35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/itamae/cli.rb +1 -0
- data/lib/itamae/logger.rb +16 -5
- data/lib/itamae/resource/file.rb +11 -7
- data/lib/itamae/runner.rb +7 -0
- data/lib/itamae/version.txt +1 -1
- data/spec/unit/lib/itamae/logger_spec.rb +1 -1
- data/spec/unit/spec_helper.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 604c4ca5d5f163d3da6cb818dee4c5978ce5c3e8
|
4
|
+
data.tar.gz: a819f6d02d1229fc3cf7c072d080843daaabe348
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6d0c852666278903d4303dab36296cb04247a02aa400f550c842010280ee97fde27d84d0c1b1413e83b16617215728f25fa411a10c8aff2b815611ac3bfcabb7
|
7
|
+
data.tar.gz: 25b9655e55512fce6d744787d2fd23bc4df68dc40fe5aad22523d4e3347a5a6d9e052900a171b3745c9080694c35ed3def32efec0f8d1a5c0ee897b91b368f6e
|
data/lib/itamae/cli.rb
CHANGED
@@ -33,6 +33,7 @@ module Itamae
|
|
33
33
|
option :key, type: :string, aliases: ['-i']
|
34
34
|
option :port, type: :numeric, aliases: ['-p']
|
35
35
|
option :ohai, type: :boolean, default: false
|
36
|
+
option :vagrant, type: :boolean, default: false
|
36
37
|
def ssh(*recipe_files)
|
37
38
|
if recipe_files.empty?
|
38
39
|
raise "Please specify recipe files."
|
data/lib/itamae/logger.rb
CHANGED
@@ -62,13 +62,24 @@ module Itamae
|
|
62
62
|
|
63
63
|
class << self
|
64
64
|
def logger
|
65
|
-
@logger ||=
|
66
|
-
logger.formatter = Formatter.new
|
67
|
-
end
|
65
|
+
@logger ||= create_logger
|
68
66
|
end
|
69
67
|
|
70
|
-
def
|
71
|
-
@
|
68
|
+
def log_device
|
69
|
+
@log_device || $stdout
|
70
|
+
end
|
71
|
+
|
72
|
+
def log_device=(value)
|
73
|
+
@log_device = value
|
74
|
+
@logger = create_logger
|
75
|
+
end
|
76
|
+
|
77
|
+
private
|
78
|
+
|
79
|
+
def create_logger
|
80
|
+
::Logger.new(log_device).tap do |logger|
|
81
|
+
logger.formatter = Formatter.new
|
82
|
+
end
|
72
83
|
end
|
73
84
|
|
74
85
|
def method_missing(method, *args, &block)
|
data/lib/itamae/resource/file.rb
CHANGED
@@ -12,17 +12,21 @@ module Itamae
|
|
12
12
|
define_attribute :group, type: String
|
13
13
|
|
14
14
|
def pre_action
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
15
|
+
begin
|
16
|
+
src = if content_file
|
17
|
+
content_file
|
18
|
+
else
|
19
|
+
f = Tempfile.open('itamae')
|
19
20
|
f.write(content)
|
21
|
+
f.close
|
20
22
|
f.path
|
21
23
|
end
|
22
|
-
end
|
23
24
|
|
24
|
-
|
25
|
-
|
25
|
+
@temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
|
26
|
+
send_file(src, @temppath)
|
27
|
+
ensure
|
28
|
+
f.unlink if f
|
29
|
+
end
|
26
30
|
|
27
31
|
case @current_action
|
28
32
|
when :create
|
data/lib/itamae/runner.rb
CHANGED
@@ -49,6 +49,13 @@ module Itamae
|
|
49
49
|
opts[:user] = options[:user] || Etc.getlogin
|
50
50
|
opts[:keys] = [options[:key]] if options[:key]
|
51
51
|
opts[:port] = options[:port] if options[:port]
|
52
|
+
|
53
|
+
if options[:vagrant]
|
54
|
+
config = Tempfile.new('', Dir.tmpdir)
|
55
|
+
`vagrant ssh-config #{opts[:host]} > #{config.path}`
|
56
|
+
opts.merge!(Net::SSH::Config.for(opts[:host], [config.path]))
|
57
|
+
opts[:host] = opts.delete(:host_name)
|
58
|
+
end
|
52
59
|
end
|
53
60
|
|
54
61
|
Backend.instance.set_type(type, opts)
|
data/lib/itamae/version.txt
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0.0.
|
1
|
+
1.0.0.beta35
|
data/spec/unit/spec_helper.rb
CHANGED