fig 0.1.7 → 0.1.8

data/bin/fig

@@ -39,7 +39,7 @@ vars = {}
 ENV.each {|key,value| vars[key]=value }
 
 remote_url = nil
-if options[:update] || options[:publish]
+if options[:update] || options[:publish] || options[:update_if_missing]
   remote_url = ENV['FIG_REMOTE_URL']
   if remote_url.nil?
     $stderr.puts "Please define the FIG_REMOTE_URL environment variable" 
@@ -57,7 +57,7 @@ if options[:publish]
 end
 
 os = OS.new
-repos = Repository.new(os, File.expand_path(File.join(options[:home], 'repos')), remote_url, remote_user)
+repos = Repository.new(os, File.expand_path(File.join(options[:home], 'repos')), remote_url, remote_user, options[:update], options[:update_if_missing])
 env = Environment.new(os, repos, vars)
 
 options[:modifiers].each do |modifier|
@@ -111,6 +111,7 @@ if options[:list]
   repos.list_packages.sort.each do |item|
     puts item
   end
+  exit 0
 end
 
 def shell_exec(cmd)

data/lib/fig/environment.rb

@@ -84,7 +84,7 @@ module Fig
       value = expand_value(base_package, name, value)
       prev = @variables[name]
       if prev
-        @variables[name] = prev + File::PATH_SEPARATOR + value
+        @variables[name] = value + File::PATH_SEPARATOR + prev
       else
         @variables[name] = value
       end

data/lib/fig/grammar.treetop

@@ -88,7 +88,7 @@ grammar Fig
   end
 
   rule path
-    "append" ws name:[a-zA-Z0-9]+ "=" value:[@a-zA-Z0-9/\-\\._]+ ws {
+    ("append" / "path" / "add") ws name:[a-zA-Z0-9]+ "=" value:[@a-zA-Z0-9/\-\\._]+ ws {
       def to_config_statement
         Path.new(name.text_value, value.text_value)
       end

data/lib/fig/options.rb

@@ -27,6 +27,9 @@ module Fig
       options[:update] = false
       opts.on('-u', '--update', 'check remote repository for updates') { options[:update] = true; options[:retrieve] = true }
 
+      options[:update_if_missing] = false
+      opts.on('-m', '--update-if-missing', 'check for updates only if package is missing locally') { options[:update_if_missing] = true; options[:retrieve] = true }
+
       options[:config] = "default"
       opts.on('-c', '--config CFG', 'name of configuration to apply') { |config| options[:config] = config }
 
@@ -71,7 +74,7 @@ module Fig
 
       options[:input] = nil
       opts.on('--file FILE', 'fig file to read (use - for stdin)') { |path| options[:input] = path }
-      opts.on('--no-file', 'ignore .fig file in current directory') { |path| options[:input] = :none }
+      opts.on('--no-file', 'ignore package.fig file in current directory') { |path| options[:input] = :none }
 
       options[:home] = ENV['FIG_HOME'] || File.expand_path("~/.fighome")
     end

data/lib/fig/repository.rb

@@ -2,11 +2,13 @@ require 'fig/parser'
 
 module Fig
   class Repository
-    def initialize(os, local_repository_dir, remote_repository_url, remote_repository_user=nil)
+    def initialize(os, local_repository_dir, remote_repository_url, remote_repository_user=nil, update=false, update_if_missing=true)
       @os = os
       @local_repository_dir = local_repository_dir
       @remote_repository_url = remote_repository_url
       @remote_repository_user = remote_repository_user
+      @update = update
+      @update_if_missing = update_if_missing
       @parser = Parser.new
     end
 
@@ -92,7 +94,9 @@ module Fig
     end
 
     def load_package(package_name, version_name)
-      update_package(package_name, version_name) if @remote_repository_url
+      if @update || (@update_if_missing && package_missing?(package_name, version_name))
+        update_package(package_name, version_name)
+      end
       read_local_package(package_name, version_name)
     end
 
@@ -194,5 +198,9 @@ module Fig
     def temp_dir_for_package(package_name, version_name)
       File.join(@local_repository_dir, "tmp")
     end
+
+    def package_missing?(package_name, version_name)
+      not File.exist?(local_fig_file_for_package(package_name, version_name))
+    end
   end
 end

data/spec/fig_spec.rb

@@ -52,16 +52,16 @@ describe "Fig" do
   end
 
   it "append environment variable from command line" do
-    fig('-p PATH=foo -g PATH').should == ["#{ENV['PATH']}#{File::PATH_SEPARATOR}foo",""]
+    fig('-p PATH=foo -g PATH').should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}",""]
   end
 
   it "append environment variable from fig file" do
     input = <<-END
       config default
-        append PATH=foo
+        add PATH=foo
       end
     END
-    fig('-g PATH', input).should == ["#{ENV['PATH']}#{File::PATH_SEPARATOR}foo",""]
+    fig('-g PATH', input).should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}",""]
   end
 
   it "append empty environment variable" do
@@ -140,7 +140,7 @@ describe "Fig" do
         include foo/1.2.3
       end
     END
-    fig('-u', input)
+    fig('-m', input)
     File.read("tmp/lib2/foo/hello").should == "some library"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Matthew Foemmel