fig 0.1.22 → 0.1.23

data/bin/fig

@@ -141,10 +141,14 @@ else
 end
 
 if options[:publish] || options[:publish_local]
-  raise "Unexpected arguments: #{argv.join(' ')}" if !argv.empty?
+  if !argv.empty?
+    puts "Unexpected arguments: #{argv.join(' ')}"
+    exit 10
+  end
   package_name, config_name, version_name = parse_descriptor(options[:publish] || options[:publish_local])
   if package_name.nil? || version_name.nil?
-    raise "Please specify a package name and a version name"
+    puts "Please specify a package name and a version name"
+    exit 10
   end
   if not options[:modifiers].empty?
     publish_statements = options[:resources] + options[:archives] + [Configuration.new("default", options[:modifiers])]
@@ -152,7 +156,8 @@ if options[:publish] || options[:publish_local]
   elsif not package.statements.empty?
     publish_statements = package.statements
   else
-    fail "Nothing to publish"
+    puts "Nothing to publish"
+    exit 1
   end
   if options[:publish]
     puts "Checking status of #{package_name}/#{version_name}..."

data/lib/fig/environment.rb

@@ -26,7 +26,10 @@ module Fig
 
     def register_package(package)
       name = package.package_name
-      raise "Package already exists with name: #{name}" if @packages[name]
+      if @packages[name]
+        puts "Package already exists with name: #{name}"
+        exit 10
+      end
       @packages[name] = package
     end
 
@@ -121,7 +124,8 @@ module Fig
         package = @repository.load_package(package_name, version_name || DEFAULT_VERSION_NAME)
         @packages[package_name] = package
       elsif version_name && version_name != package.version_name
-        raise "Version mismatch: #{package_name}" 
+        puts "Version mismatch: #{package_name}" 
+        exit 10
       end
       package
     end
@@ -151,7 +155,10 @@ module Fig
     def expand_arg(arg)
       arg.gsub(/\@([a-zA-Z0-9\-\.]+)/) do |match|
         package = @packages[$1]
-        raise "Package not found: #{$1}" if package.nil?
+        if package.nil?
+          puts "Package not found: #{$1}"
+          exit 10
+        end
         package.directory
       end
     end

data/lib/fig/grammar.treetop

@@ -99,7 +99,7 @@ grammar Fig
   end
 
   rule descriptor
-    ((package:[a-zA-Z0-9.-]+ ("/" version:[a-zA-Z0-9.\-]+)? (":" config:config_name)? ws) / 
+    ((package:[a-zA-Z0-9.-]+ ("/" version:[a-zA-Z0-9_\-.]+)? (":" config:config_name)? ws) / 
     (":" config:config_name ws)) {
       def get_version
         elements.each do |element|

data/lib/fig/os.rb

@@ -41,7 +41,8 @@ module Fig
       begin
         uri = URI.parse(url)
       rescue 
-        raise "Unable to parse url: '#{url}'"
+        puts "Unable to parse url: '#{url}'"
+        exit 10
       end
       case uri.scheme
       when "ftp"
@@ -69,7 +70,8 @@ module Fig
         end
         packages
       else
-        raise "Protocol not supported: #{url}"
+        puts "Protocol not supported: #{url}"
+        exit 10
       end
     end
     
@@ -107,7 +109,8 @@ module Fig
         cmd = `which fig-download`.strip + " #{timestamp} #{uri.path}"
         ssh_download(uri.user, uri.host, path, cmd)
       else
-        raise "Unknown protocol: #{url}"
+        puts "Unknown protocol: #{url}"
+        exit 10
       end
    end
     
@@ -131,7 +134,8 @@ module Fig
       when /\.zip$/
         unpack_archive(dir, path)
       else
-        raise "Unknown archive type: #{basename}"
+        puts "Unknown archive type: #{basename}"
+        exit 10
       end
     end
     
@@ -176,7 +180,12 @@ module Fig
     end
 
     def exec(dir,command)
-      Dir.chdir(dir) { raise "Command failed" unless system command }
+      Dir.chdir(dir) {
+        unless system command
+          puts "Command failed"
+          exit 10
+        end
+      }
     end
     
     def copy(source, target)
@@ -277,7 +286,8 @@ module Fig
         return false
       when NOT_FOUND
         tempfile.delete
-        raise "File not found: #{path}"
+        puts "File not found: #{path}"
+        exit 10
       when SUCCESS
         FileUtils.mv(tempfile.path, path)
         return true

data/lib/fig/package.rb

@@ -13,7 +13,8 @@ module Fig
       @statements.each do |stmt|
         return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
       end
-      raise "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+      puts "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+      exit 10
     end
 
     def configs

data/lib/fig/parser.rb

@@ -13,7 +13,8 @@ module Fig
       input = input.gsub(/#.*$/, '')
       result = @parser.parse(" #{input} ")
       if result.nil? 
-        raise "#{directory}: #{@parser.failure_reason}"
+        puts "#{directory}: #{@parser.failure_reason}"
+        exit 10
       end
       result.to_package(package_name, version_name, directory)
     end

data/lib/fig/repository.rb

@@ -137,7 +137,8 @@ module Fig
         file = File.join(dir, "package.fig")
       end
       if not File.exist?(file)
-        raise "File not found: #{file}"
+        puts "Fig file not found for package: #{file}"
+        exit 10
       end
       read_package_from_file(file, package_name, version_name)
     end
@@ -190,9 +191,9 @@ module Fig
         end
         write_local_package(package_name, version_name, package)
       rescue
-        $stderr.puts "install failed, cleaning up" 
+        $stderr.puts "Install failed, cleaning up" 
         delete_local_package(package_name, version_name)
-        raise
+        exit 10
       end
     end
 

data/spec/fig_spec.rb

@@ -199,6 +199,31 @@ describe "Fig" do
     File.read("tmp/lib2/foo/hello").should == "some library"
   end
 
+  it "retrieves resource that is a directory" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/lib")
+    File.open("tmp/lib/hello", "w") { |f| f << "some library" }
+    # To copy the contents of a directory, instead of the directory itself,
+    # use '/.' as a suffix to the directory name in 'append'.
+    input = <<-END
+      resource tmp/lib/hello
+      config default
+        append FOOPATH=@/tmp/lib/.
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    input = <<-END
+      retrieve FOOPATH->tmp/lib2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-m', input)
+    File.read("tmp/lib2/foo/hello").should == "some library"
+  end
+
   it "retrieve preserves the path after '//' when copying files into your project directory" do
     FileUtils.rm_rf(FIG_HOME)
     FileUtils.rm_rf(FIG_REMOTE_DIR)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
+  hash: 53
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 22
-  version: 0.1.22
+  - 23
+  version: 0.1.23
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -06:00
+date: 2011-02-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..