fig 0.1.6 → 0.1.7

data/bin/fig

@@ -21,12 +21,15 @@ def parse_descriptor(descriptor)
   return package_name, config_name, version_name
 end
 
+shell_command = nil
 ARGV.each_with_index do |arg, i|
   if arg == "-"
 #    $stderr.puts "Use of single dash (-) is deprecated. Use double dash (--) instead"
 #    exit 1 
   elsif arg == "--"
-    ARGV[i] = "-"
+    shell_command = ARGV[(i+1)..-1]
+    ARGV.slice!(i..-1)
+    break
   end
 end
 
@@ -122,17 +125,18 @@ if options[:publish]
   end
   if not options[:modifiers].empty?
     publish_statements = options[:resources] + options[:archives] + [Configuration.new("default", options[:modifiers])]
-  elsif not package.publish_statements.empty?
-    publish_statements = package.publish_statements
+    publish_statements << Publish.new("default","default")
+  elsif not package.statements.empty?
+    publish_statements = package.statements
   else
     fail "Nothing to publish"
   end
   repos.publish_package(publish_statements, package_name, version_name)
 elsif options[:echo]
   puts env[options[:echo]]
-elsif argv[0] == "-"
+elsif shell_command
   argv.shift
-  env.execute_shell(argv) { |cmd| shell_exec cmd }
+  env.execute_shell(shell_command) { |cmd| shell_exec cmd }
 elsif argv[0]
   package_name, config_name, version_name = parse_descriptor(argv.shift)
   env.include_config(package, package_name, config_name, version_name)

data/lib/fig/environment.rb

@@ -69,13 +69,13 @@ module Fig
       end
     end
 
-    private 
-
     def include_config(base_package, package_name, config_name, version_name)
       package = lookup_package(package_name || base_package.package_name, version_name)
       apply_config(package, config_name || "default")
     end
 
+    private 
+
     def set_variable(base_package, name, value)
       @variables[name] = expand_value(base_package, name, value)
     end

data/lib/fig/grammar.treetop

@@ -40,9 +40,18 @@ grammar Fig
   end
 
   rule publish
-    "publish" ws statements:(package_statement / install)* "end" ws {
+    "publish" ws local_name:config_name ("->" remote_name:config_name)? ws {
       def to_package_statement
-        Publish.new(statements.elements.map { |statement| statement.to_package_statement })
+        Publish.new(local_name.text_value, get_remote_name)
+      end
+
+      def get_remote_name
+        elements.each do |element|
+          if element.respond_to?(:remote_name) 
+            return element.remote_name.text_value
+          end
+        end
+        local_name.text_value
       end
     }
   end
@@ -130,7 +139,7 @@ grammar Fig
   end
 
   rule config_name
-    [a-zA-Z0-9\\-]+
+    [a-zA-Z0-9_]+
   end
 
   rule name

data/lib/fig/options.rb

@@ -14,7 +14,7 @@ module Fig
     options = {}
 
     parser = OptionParser.new do |opts|
-      opts.banner = "Usage: fig [--debug] [--update] [--config <config>] [-echo <var> | --list | <package> | - <command>]"
+      opts.banner = "Usage: fig [--debug] [--update] [--config <config>] [--get <var> | --list | <package> | - <command>]"
 
       opts.on('-?', '-h','--help','display this help text') do
         puts opts

data/lib/fig/os.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'ftools'
 require 'uri'
 require 'net/http'
 require 'tempfile'
@@ -136,7 +135,7 @@ module Fig
 
    def copy(source, target)
      FileUtils.mkdir_p(File.dirname(target))
-     File.copy(source, target)
+     FileUtils.copy_file(source, target)
      target
    end
 

data/lib/fig/package.rb

@@ -29,13 +29,6 @@ module Fig
       @statements.select{|s| s.is_a?(Resource)}.map{|s|s.url}
     end
     
-    def publish_statements
-      statements
-#      statements = []
-#      @statements.each{ |s| statements += s.statements if s.is_a?(Publish) }
-#      statements
-    end
-    
     def unparse
       @statements.map { |statement| statement.unparse('') }.join("\n")
     end
@@ -83,17 +76,15 @@ module Fig
   end
 
   class Publish
-    attr_reader :statements
+    attr_reader :local_name, :remote_name
 
-    def initialize(statements)
-      @statements = statements
+    def initialize(local_name, remote_name)
+      @local_name = local_name
+      @remote_name = remote_name
     end
     
     def unparse(indent)
-      prefix = "\n#{indent}publish"
-      body = @statements.map { |statement| statement.unparse(indent+'  ') }.join("\n")
-      suffix = "#{indent}end"
-      return [prefix, body, suffix].join("\n")
+      "#{indent}publish #{@local_name}->#{@remote_name}"
     end
   end
 
@@ -118,6 +109,10 @@ module Fig
       @statements = statements
     end
 
+    def with_name(name)
+      Configuration.new(name, statements)
+    end
+
     def commands
       result = statements.select { |statement| statement.is_a?(Command) }
 #      if result.empty?

data/lib/fig/parser.rb

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

data/lib/fig/repository.rb

@@ -30,8 +30,11 @@ module Fig
       temp_dir = temp_dir_for_package(package_name, version_name)
       @os.clear_directory(temp_dir)
       fig_file = File.join(temp_dir, ".fig")
+      config_mapping = get_config_mapping(package_statements)
       content = bundle_resources(package_statements).map do |statement| 
-        if statement.is_a?(Archive) || statement.is_a?(Resource)
+        if statement.is_a?(Publish)
+          nil
+        elsif statement.is_a?(Archive) || statement.is_a?(Resource)
           if statement.is_a?(Resource) && !is_url?(statement.url)
             archive_name = statement.url
             archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{statement.url}"
@@ -47,15 +50,29 @@ module Fig
           end
           @os.upload(archive_local, archive_remote, @remote_repository_user)
           statement.class.new(archive_name).unparse('')
+        elsif statement.is_a?(Configuration)
+          remote_name = config_mapping[statement.name]
+          if remote_name
+            statement.with_name(remote_name).unparse('')
+          else
+            nil
+          end
         else
           statement.unparse('')
         end
-      end
-      @os.write(fig_file, content.join("\n"))
+      end.select {|s|not s.nil?}
+      @os.write(fig_file, content.join("\n").strip)
       @os.upload(fig_file, remote_fig_file_for_package(package_name, version_name), @remote_repository_user)
 #      update_package(package_name, version_name)
     end
 
+    def get_config_mapping(package_statements)
+      publish_mappings = {}
+      package_statements.each{|s| publish_mappings[s.local_name] = s.remote_name if s.is_a?(Publish) }
+      publish_mappings
+    end
+    
+
     def bundle_resources(package_statements)
       resources = []
       new_package_statements = package_statements.reject do |statement|

data/spec/fig_spec.rb

@@ -68,10 +68,23 @@ describe "Fig" do
     fig('-p XYZZY=foo -g XYZZY').should == ["foo",""]
   end
 
+  it "should ignore comments" do
+    input = <<-END
+      #/usr/bin/env fig
+
+      # Some comment
+      config default
+        set FOO=BAR # Another comment
+      end
+    END
+    fig('-g FOO', input)[0].should == 'BAR'
+  end
+
   it "publish to remote repository" do
     FileUtils.rm_rf(FIG_HOME)
     FileUtils.rm_rf(FIG_REMOTE_DIR)
     input = <<-END
+      publish default
       config default
         set FOO=BAR
       end
@@ -87,8 +100,9 @@ describe "Fig" do
     File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
     fail unless system "chmod +x tmp/bin/hello"
     input = <<-END
+      publish test->default
       resource tmp/bin/hello
-      config default
+      config test
         append PATH=@/tmp/bin
       end
     END
@@ -113,6 +127,7 @@ describe "Fig" do
     FileUtils.mkdir_p("tmp/lib")
     File.open("tmp/lib/hello", "w") { |f| f << "some library" }
     input = <<-END
+      publish default
       resource tmp/lib/hello
       config default
         append FOOPATH=@/tmp/lib/hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -06:00
+date: 2010-01-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency