fig 0.1.34 → 0.1.35

data/lib/fig/os.rb

@@ -88,7 +88,7 @@ module Fig
         Net::SSH.start(uri.host, uri.user) do |ssh|
           ls = ssh.exec!("[ -d #{uri.path} ] && find #{uri.path}")
           if not ls.nil?
-            ls = ls.gsub(uri.path + "/", "").gsub(uri.path, "")
+            ls = ls.gsub(uri.path + "/", "").gsub(uri.path, "").split("\n")
             ls.each do |line|
               parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').chomp().split('/')
               packages << parts.join('/') if parts.size == 2
@@ -255,7 +255,7 @@ module Fig
           end
         end
       else
-        if !FileUtils.uptodate?(target, source)
+        if !FileUtils.uptodate?(target, [source])
           log_info "#{msg} #{target}" if msg
           FileUtils.mkdir_p(File.dirname(target))
           FileUtils.cp(source, target)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.34
+  hash: 93
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 35
+  version: 0.1.35
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,89 +15,152 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -05:00
+date: 2011-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libarchive
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-netrc
+  name: net-sftp
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 0
+        - 5
+        version: 2.0.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: net-netrc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: polyglot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 2
+        - 9
         version: 0.2.9
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
         version: "1.3"
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :development
+  version_requirements: *id009
 description: Fig is a utility for configuring environments and managing dependencies across a team of developers. You give it a list of packages and a shell command to run; it creates an environment that includes those packages, then executes the shell command in it (the caller's environment is not affected).
 email: git@foemmel.com
 executables: 
@@ -121,30 +190,34 @@ homepage: http://github.com/mfoemmel/fig
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..
-test_files: 
-- spec/fig_spec.rb
-- spec/spec_helper.rb
-- spec/win_spec.rb
+test_files: []
+

data/spec/fig_spec.rb

@@ -1,331 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-require 'rubygems'
-require 'fig/os'
-require 'rake'
-require 'fileutils'
-
-class Popen
-  if Fig::OS.windows?
-    require 'win32/open3'
-    def self.popen(*cmd)
-      Open3.popen3(*cmd) { |stdin,stdout,stderr|
-        yield stdin, stdout, stderr
-      }
-    end
-  elsif Fig::OS.java?
-    require 'open3'
-    def self.popen(*cmd)
-      Open3.popen3(*cmd) { |stdin,stdout,stderr|
-        yield stdin, stdout, stderr
-      }
-    end
-  else
-    require 'open4'
-    def self.popen(*cmd)
-      Open4::popen4(*cmd) { |pid, stdin, stdout, stderr|
-        yield stdin, stdout, stderr
-      }
-    end
-  end
-end
-
-FIG_HOME = File.expand_path(File.dirname(__FILE__) + '/../tmp/fighome')
-FileUtils.mkdir_p(FIG_HOME)
-ENV['FIG_HOME'] = FIG_HOME
-
-FIG_REMOTE_DIR = File.expand_path(File.dirname(__FILE__) + '/../tmp/remote')
-FileUtils.mkdir_p(FIG_REMOTE_DIR)
-ENV['FIG_REMOTE_URL'] = "ssh://#{ENV['USER']}@localhost#{FIG_REMOTE_DIR}"
-
-FIG_EXE = File.expand_path(File.dirname(__FILE__) + '/../bin/fig')
-
-def fig(args, input=nil)
-  args = "--file - #{args}" if input
-  out = nil
-  err = nil
-  Popen.popen("#{RUBY} #{FIG_EXE} #{args}") do |stdin, stdout, stderr|
-    if input
-      stdin.puts input
-      stdin.close
-    end
-    err = stderr.read.strip
-    out = stdout.read.strip
-    if err != ""
-      $stderr.puts err
-    end
-  end
-  return out, err, $?.exitstatus
-end
-
-describe "Fig" do
-  it "set environment variable from command line" do
-    fig('-s FOO=BAR -g FOO')[0].should == 'BAR'
-    fig('--set FOO=BAR -g FOO')[0].should == 'BAR'
-  end
-
-  it "set environment variable from fig file" do
-    input = <<-END
-      config default
-        set FOO=BAR
-      end
-    END
-    fig('-g FOO', input)[0].should == 'BAR'
-  end
-
-  it "append environment variable from command line" do
-    fig('-p PATH=foo -g PATH').should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}","",0]
-  end
-
-  it "append environment variable from fig file" do
-    input = <<-END
-      config default
-        add PATH=foo
-      end
-    END
-    fig('-g PATH', input).should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}","",0]
-  end
-
-  it "append empty environment variable" do
-    fig('-p XYZZY=foo -g XYZZY').should == ["foo","",0]
-  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
-      config default
-        set FOO=BAR
-      end
-    END
-    fig('--publish foo/1.2.3', input)
-    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
-    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'BAR'
-  end
-
-  it "publish resource to remote repository" do
-    FileUtils.rm_rf(FIG_HOME)
-    FileUtils.rm_rf(FIG_REMOTE_DIR)
-    FileUtils.mkdir_p("tmp/bin")
-    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
-    fail unless system "chmod +x tmp/bin/hello"
-    input = <<-END
-      resource tmp/bin/hello
-      config default
-        append PATH=@/tmp/bin
-      end
-    END
-    fig('--publish foo/1.2.3', input)
-    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
-    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-u -i foo/1.2.3 -- hello')[0].should == 'bar'
-  end
-
-  it "publish resource to remote repository using command line" do
-    FileUtils.rm_rf(FIG_HOME)
-    FileUtils.rm_rf(FIG_REMOTE_DIR)
-    FileUtils.mkdir_p("tmp/bin")
-    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
-    fail unless system "chmod +x tmp/bin/hello"
-    fig('--publish foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
-    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
-    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-u -i foo/1.2.3 -- hello')[0].should == 'bar'
-  end
-
-  it "refuses to overwrite existing version in remote repository without being forced" do
-    FileUtils.rm_rf(FIG_HOME)
-    FileUtils.rm_rf(FIG_REMOTE_DIR)
-    input = <<-END
-      config default
-        set FOO=SHEEP
-      end
-    END
-    fig('--publish foo/1.2.3', input)
-    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
-    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'SHEEP'
-
-    input = <<-END
-      config default
-        set FOO=CHEESE
-      end
-    END
-    (out, err, exitstatus) = fig('--publish foo/1.2.3', input)
-    exitstatus.should == 1
-    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'SHEEP'
-
-    (out, err, exitstatus) = fig('--publish foo/1.2.3 --force', input)
-    exitstatus.should == 0
-    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'CHEESE'
-  end
-
-  it "publishes to the local repo only when told to" do
-    FileUtils.rm_rf(FIG_HOME)
-    FileUtils.rm_rf(FIG_REMOTE_DIR)
-    FileUtils.mkdir_p("tmp/bin")
-    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
-    fail unless system "chmod +x tmp/bin/hello"
-    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
-    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-m -i foo/1.2.3 -- hello')[0].should == 'bar'
-  end
-
-  it "retrieve resource" 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" }
-    input = <<-END
-      resource tmp/lib/hello
-      config default
-        append FOOPATH=@/tmp/lib/hello
-      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 "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)
-    FileUtils.rm_rf("tmp")
-    FileUtils.mkdir_p("tmp/include")
-    File.open("tmp/include/hello.h", "w") { |f| f << "a header file" }
-    File.open("tmp/include/hello2.h", "w") { |f| f << "another header file" }
-    input = <<-END
-      resource tmp/include/hello.h
-      resource tmp/include/hello2.h
-      config default
-        append INCLUDE=@/tmp//include/hello.h
-        append INCLUDE=@/tmp//include/hello2.h
-      end
-    END
-    fig('--publish foo/1.2.3', input)
-
-    input = <<-END
-      retrieve INCLUDE->tmp/include2/[package]
-      config default
-        include foo/1.2.3
-      end
-    END
-    fig('-u', input)
-
-    File.read("tmp/include2/foo/include/hello.h").should == "a header file"
-    File.read("tmp/include2/foo/include/hello2.h").should == "another header file"
-  end
-
-  it "package multiple resources" 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" }
-    File.open("tmp/lib/hello2", "w") { |f| f << "some other library" }
-    input = <<-END
-      resource tmp/lib/hello
-      resource tmp/lib/hello2
-      config default
-        append FOOPATH=@/tmp/lib/hello
-        append FOOPATH=@/tmp/lib/hello2
-      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"
-    File.read("tmp/lib2/foo/hello2").should == "some other library"
-  end
-
-  it "packages multiple resources with wildcards" 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/foo.jar", "w") { |f| f << "some library" }
-    File.open("tmp/lib/bar.jar", "w") { |f| f << "some other library" }
-    input = <<-END
-      resource tmp/**/*.jar
-      config default
-        append FOOPATH=@/tmp/lib/foo.jar
-      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/foo.jar").should == "some library"
-  end
-
-  it "update local packages if they already exist" do
-    FileUtils.rm_rf(FIG_HOME)
-    FileUtils.rm_rf(FIG_REMOTE_DIR)
-    FileUtils.mkdir_p("tmp/bin")
-    File.open("tmp/bin/hello", "w") { |f| f << "echo sheep" }
-    fail unless system "chmod +x tmp/bin/hello"
-    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
-    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-m -i foo/1.2.3 -- hello')[0].should == 'sheep'
-    
-    File.open("tmp/bin/hello", "w") { |f| f << "echo cheese" }
-    fail unless system "chmod +x tmp/bin/hello"
-    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
-    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
-    fig('-m -i foo/1.2.3 -- hello')[0].should == 'cheese'
-  end
-end

data/spec/spec_helper.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'fig'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end

data/spec/win_spec.rb

@@ -1,21 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'fig/os'
-require 'fig/windows'
-
-
-# Only run on Windows...
-if Fig::OS.windows?
-  describe "Fig on Windows" do
-    it "batch script should exist" do
-      Fig::Windows.with_generated_batch_script(["echo", "Hello World"]) do |filename|
-        File.exist?(filename).should == true
-      end
-    end
-
-    it "batch script should say 'Hello World' when executed" do
-      Fig::Windows.with_generated_batch_script(["echo", "Hello World"]) do |filename|
-        %x[#{filename}].should == "Hello World\n"
-      end
-    end
-  end
-end