fig 0.1.25 → 0.1.26
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/fig +3 -3
- data/lib/fig/environment.rb +3 -3
- data/lib/fig/os.rb +8 -8
- data/lib/fig/package.rb +1 -1
- data/lib/fig/parser.rb +1 -1
- data/lib/fig/repository.rb +1 -1
- metadata +1 -1
data/bin/fig
CHANGED
@@ -142,12 +142,12 @@ end
|
|
142
142
|
|
143
143
|
if options[:publish] || options[:publish_local]
|
144
144
|
if !argv.empty?
|
145
|
-
puts "Unexpected arguments: #{argv.join(' ')}"
|
145
|
+
$stderr.puts "Unexpected arguments: #{argv.join(' ')}"
|
146
146
|
exit 10
|
147
147
|
end
|
148
148
|
package_name, config_name, version_name = parse_descriptor(options[:publish] || options[:publish_local])
|
149
149
|
if package_name.nil? || version_name.nil?
|
150
|
-
puts "Please specify a package name and a version name"
|
150
|
+
$stderr.puts "Please specify a package name and a version name"
|
151
151
|
exit 10
|
152
152
|
end
|
153
153
|
if not options[:modifiers].empty?
|
@@ -156,7 +156,7 @@ if options[:publish] || options[:publish_local]
|
|
156
156
|
elsif not package.statements.empty?
|
157
157
|
publish_statements = package.statements
|
158
158
|
else
|
159
|
-
puts "Nothing to publish"
|
159
|
+
$stderr.puts "Nothing to publish"
|
160
160
|
exit 1
|
161
161
|
end
|
162
162
|
if options[:publish]
|
data/lib/fig/environment.rb
CHANGED
@@ -28,7 +28,7 @@ module Fig
|
|
28
28
|
def register_package(package)
|
29
29
|
name = package.package_name
|
30
30
|
if @packages[name]
|
31
|
-
puts "Package already exists with name: #{name}"
|
31
|
+
$stderr.puts "Package already exists with name: #{name}"
|
32
32
|
exit 10
|
33
33
|
end
|
34
34
|
@packages[name] = package
|
@@ -129,7 +129,7 @@ module Fig
|
|
129
129
|
package = @repository.load_package(package_name, version_name || DEFAULT_VERSION_NAME)
|
130
130
|
@packages[package_name] = package
|
131
131
|
elsif version_name && version_name != package.version_name
|
132
|
-
puts "Version mismatch: #{package_name}"
|
132
|
+
$stderr.puts "Version mismatch: #{package_name}"
|
133
133
|
exit 10
|
134
134
|
end
|
135
135
|
package
|
@@ -161,7 +161,7 @@ module Fig
|
|
161
161
|
arg.gsub(/\@([a-zA-Z0-9\-\.]+)/) do |match|
|
162
162
|
package = @packages[$1]
|
163
163
|
if package.nil?
|
164
|
-
puts "Package not found: #{$1}"
|
164
|
+
$stderr.puts "Package not found: #{$1}"
|
165
165
|
exit 10
|
166
166
|
end
|
167
167
|
package.directory
|
data/lib/fig/os.rb
CHANGED
@@ -41,7 +41,7 @@ module Fig
|
|
41
41
|
begin
|
42
42
|
uri = URI.parse(url)
|
43
43
|
rescue
|
44
|
-
puts "Unable to parse url: '#{url}'"
|
44
|
+
$stderr.puts "Unable to parse url: '#{url}'"
|
45
45
|
exit 10
|
46
46
|
end
|
47
47
|
case uri.scheme
|
@@ -70,7 +70,7 @@ module Fig
|
|
70
70
|
end
|
71
71
|
packages
|
72
72
|
else
|
73
|
-
puts "Protocol not supported: #{url}"
|
73
|
+
$stderr.puts "Protocol not supported: #{url}"
|
74
74
|
exit 10
|
75
75
|
end
|
76
76
|
end
|
@@ -86,7 +86,7 @@ module Fig
|
|
86
86
|
if File.exist?(path) && ftp.mtime(uri.path) <= File.mtime(path)
|
87
87
|
return false
|
88
88
|
else
|
89
|
-
puts "downloading #{url}"
|
89
|
+
$stderr.puts "downloading #{url}"
|
90
90
|
ftp.getbinaryfile(uri.path, path, 256*1024)
|
91
91
|
return true
|
92
92
|
end
|
@@ -95,7 +95,7 @@ module Fig
|
|
95
95
|
end
|
96
96
|
when "http"
|
97
97
|
http = Net::HTTP.new(uri.host)
|
98
|
-
puts "downloading #{url}"
|
98
|
+
$stderr.puts "downloading #{url}"
|
99
99
|
File.open(path, "wb") do |file|
|
100
100
|
file.binmode
|
101
101
|
http.get(uri.path) do |block|
|
@@ -109,7 +109,7 @@ module Fig
|
|
109
109
|
cmd = `which fig-download`.strip + " #{timestamp} #{uri.path}"
|
110
110
|
ssh_download(uri.user, uri.host, path, cmd)
|
111
111
|
else
|
112
|
-
puts "Unknown protocol: #{url}"
|
112
|
+
$stderr.puts "Unknown protocol: #{url}"
|
113
113
|
exit 10
|
114
114
|
end
|
115
115
|
end
|
@@ -134,7 +134,7 @@ module Fig
|
|
134
134
|
when /\.zip$/
|
135
135
|
unpack_archive(dir, path)
|
136
136
|
else
|
137
|
-
puts "Unknown archive type: #{basename}"
|
137
|
+
$stderr.puts "Unknown archive type: #{basename}"
|
138
138
|
exit 10
|
139
139
|
end
|
140
140
|
end
|
@@ -182,7 +182,7 @@ module Fig
|
|
182
182
|
def exec(dir,command)
|
183
183
|
Dir.chdir(dir) {
|
184
184
|
unless system command
|
185
|
-
puts "Command failed"
|
185
|
+
$stderr.puts "Command failed"
|
186
186
|
exit 10
|
187
187
|
end
|
188
188
|
}
|
@@ -298,7 +298,7 @@ module Fig
|
|
298
298
|
return false
|
299
299
|
when NOT_FOUND
|
300
300
|
tempfile.delete
|
301
|
-
puts "File not found: #{path}"
|
301
|
+
$stderr.puts "File not found: #{path}"
|
302
302
|
exit 10
|
303
303
|
when SUCCESS
|
304
304
|
FileUtils.mv(tempfile.path, path)
|
data/lib/fig/package.rb
CHANGED
@@ -13,7 +13,7 @@ module Fig
|
|
13
13
|
@statements.each do |stmt|
|
14
14
|
return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
|
15
15
|
end
|
16
|
-
puts "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
|
16
|
+
$stderr.puts "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
|
17
17
|
exit 10
|
18
18
|
end
|
19
19
|
|
data/lib/fig/parser.rb
CHANGED
@@ -13,7 +13,7 @@ module Fig
|
|
13
13
|
input = input.gsub(/#.*$/, '')
|
14
14
|
result = @parser.parse(" #{input} ")
|
15
15
|
if result.nil?
|
16
|
-
puts "#{directory}: #{@parser.failure_reason}"
|
16
|
+
$stderr.puts "#{directory}: #{@parser.failure_reason}"
|
17
17
|
exit 10
|
18
18
|
end
|
19
19
|
result.to_package(package_name, version_name, directory)
|
data/lib/fig/repository.rb
CHANGED
@@ -137,7 +137,7 @@ module Fig
|
|
137
137
|
file = File.join(dir, "package.fig")
|
138
138
|
end
|
139
139
|
if not File.exist?(file)
|
140
|
-
puts "Fig file not found for package: #{file}"
|
140
|
+
$stderr.puts "Fig file not found for package: #{file}"
|
141
141
|
exit 10
|
142
142
|
end
|
143
143
|
read_package_from_file(file, package_name, version_name)
|