fig 0.1.2 → 0.1.3

data/README.md

@@ -71,7 +71,7 @@ Fig lets you modify environment variables three ways:
 
 ### Command Line ###
 
-So to get started, let's trying defining an environment variable via the command line and executing a command in the newly created environment. We'll set the "PLANET" variable to "NEPTUNE", then run "echo $PLANET" to ensure that the variable was updated:
+So to get started, let's trying defining an environment variable via the command line and executing a command in the newly created environment. We'll set the "GREETING" variable to "Hello", then run "echo $GREETING, World" to ensure that the variable was updated:
 
     $ fig -s GREETING=Hello -- echo "\$GREETING, World"
     Hello, World
@@ -126,9 +126,21 @@ Configurations other than "default" can be specified using the "-c" option:
 
 Now let's say we want to share our little script with the rest of the team by bundling it into a package. The first thing you'll need to do is specify the location of your remote repository by defining the FIG_REMOTE_URL environment variable. If you just want to play around with fig, you can have it point to localhost:
 
-   $ export FIG_REMOTE_URL=ssh://localhost/<path to home dir>/figremote
+   $ export FIG_REMOTE_URL=ssh://localhost`pwd`/remote
 
-...TODO...
+Before we publish our package, we'll need to tell fig which files we want to include. We do this by using the "resource" statement in our ".fig" file:
+
+    resource bin/hello
+
+    config default...
+
+Now we can share the package with the rest of the team by using the "--publish" option:
+
+    $ fig --publish hello/1.0.0
+
+The "hello/1.0.0" string represents the name of the package and the version number. Once the package has been published, we can include it in other environments by using the "-i" option (we'll use the "--no-file" option here, to tell fig not to parse the ".fig" file in the current directory):
+
+    $ fig --no-file -i hello/1.0.0 -- hello
 
 Community
 =========

data/bin/fig

@@ -73,7 +73,9 @@ end
 DEFAULT_FIG_FILE = '.fig'
 
 input = nil
-if options[:input] == '-'
+if options[:input] == :none
+  # ignore
+elsif options[:input] == '-'
   input = $stdin.read
 elsif options[:input].nil?
   input = os.read(DEFAULT_FIG_FILE) if os.exist?(DEFAULT_FIG_FILE)

data/lib/fig/grammar.treetop

@@ -138,7 +138,7 @@ grammar Fig
   end
 
   rule url
-    '"' value:[a-zA-Z0-9:/\-\\._]+ '"' ws
+    (value:[a-zA-Z0-9:/\-\\._]+ ws) / ('"' value:[a-zA-Z0-9:/\-\\._]+ '"' ws)
   end
 
   rule ws

data/lib/fig/options.rb

@@ -41,6 +41,7 @@ module Fig
 
       options[:input] = nil
       opts.on('--input FILE', 'fig file to read (use - for stdin)') { |path| options[:input] = path }
+      opts.on('--no-file', 'fig file to read (use - for stdin)') { |path| options[:input] = :none }
 
       options[:home] = ENV['FIG_HOME'] || File.expand_path("~/.fighome")
     end

data/lib/fig/os.rb

@@ -48,8 +48,15 @@ module Fig
          end
        end
      when "ssh"
-       puts "downloading #{url}"
-       fail unless system "ssh #{uri.user + '@' if uri.user}#{uri.host} cat #{uri.path} > #{path}"
+       # TODO need better way to do conditional download
+       timestamp = `ssh #{uri.user + '@' if uri.user}#{uri.host} "ruby -e 'puts File.mtime(\\"#{uri.path}\\").to_i'"`.to_i
+       if File.exist?(path) && File.mtime(path).to_i > timestamp
+         return false
+       else
+         $stderr.puts "downloading #{url}"
+         fail unless system "ssh #{uri.user + '@' if uri.user}#{uri.host} cat #{uri.path} > #{path}"
+         return true
+       end
      else
        raise "Unknown protocol: #{url}"
      end

data/lib/fig/package.rb

@@ -30,9 +30,10 @@ module Fig
     end
     
     def publish_statements
-      statements = []
-      @statements.each{ |s| statements += s.statements if s.is_a?(Publish) }
       statements
+#      statements = []
+#      @statements.each{ |s| statements += s.statements if s.is_a?(Publish) }
+#      statements
     end
     
     def unparse
@@ -64,7 +65,7 @@ module Fig
     end
     
     def unparse(indent)
-      "#{indent}resource \"#{url}\""
+      "#{indent}resource #{url}"
     end
   end
   

data/lib/fig/repository.rb

@@ -24,10 +24,15 @@ module Fig
       temp_dir = temp_dir_for_package(package_name, version_name)
       @os.clear_directory(temp_dir)
       fig_file = File.join(temp_dir, ".fig")
-      content = package_statements.map do |statement| 
+      content = bundle_resources(package_statements).map do |statement| 
         if statement.is_a?(Archive) || statement.is_a?(Resource)
-          archive_name = statement.url.split("/").last
-          archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{archive_name}"
+          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}"
+          else
+            archive_name = statement.url.split("/").last
+            archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{archive_name}"
+          end
           if is_url?(statement.url)
             archive_local = File.join(temp_dir, archive_name)
             @os.download(statement.url, archive_local)
@@ -45,6 +50,24 @@ module Fig
       update_package(package_name, version_name)
     end
 
+    def bundle_resources(package_statements)
+      resources = []
+      new_package_statements = package_statements.reject do |statement|
+        if statement.is_a?(Resource) && !is_url?(statement.url)
+          resources << statement.url
+          true
+        else
+          false
+        end
+      end
+      if resources.size > 0
+        file = "resources.tar.gz"
+        file unless system "tar -zcf #{file} #{resources.join(' ')}"
+        new_package_statements.unshift(Archive.new(file))
+      end
+      new_package_statements
+    end
+
     def load_package(package_name, version_name)
       update_package(package_name, version_name) if @remote_repository_url
       read_local_package(package_name, version_name)

data/spec/fig_spec.rb

@@ -57,14 +57,30 @@ describe "Fig" do
   end
 
   it "publish to remote repository" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
     input = <<-END
-      publish
-        config default
-          set FOO=BAR
-        end
+      config default
+        set FOO=BAR
       end
     END
     puts fig('--publish foo/1.2.3', input)
     fig('-i foo/1.2.3 -g FOO').should == ['BAR','']
   end
+
+  it "publish resource to remote repository" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.mkdir_p("bin")
+    File.open("bin/hello", "w") { |f| f << "echo bar" }
+    fail unless system "chmod +x bin/hello"
+    input = <<-END
+      resource bin/hello
+      config default
+        append PATH=@/bin
+      end
+    END
+    puts fig('--publish foo/1.2.3', input)
+    fig('-u -i foo/1.2.3 -- hello')[0].should == 'bar'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -06:00
+date: 2010-01-02 00:00:00 -06:00
 default_executable: fig
 dependencies: 
 - !ruby/object:Gem::Dependency