fig 0.1.16 → 0.1.17

data/bin/fig

@@ -129,7 +129,7 @@ if input
       end
     end
   end
-  unless options[:publish] || options[:list]
+  unless options[:publish] || options[:list] || options[:publish_local]
     env.register_package(package)
     env.apply_config(package, options[:config])
     direct_retrieves.each do |info|
@@ -140,9 +140,9 @@ else
   package = Package.new(nil, nil, ".", [])
 end
 
-if options[:publish]
+if options[:publish] || options[:publish_local]
   raise "Unexpected arguments: #{argv.join(' ')}" if !argv.empty?
-  package_name, config_name, version_name = parse_descriptor(options[:publish])
+  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"
   end
@@ -154,7 +154,20 @@ if options[:publish]
   else
     fail "Nothing to publish"
   end
-  repos.publish_package(publish_statements, package_name, version_name)
+  if options[:publish]
+    puts "Checking status of #{package_name}/#{version_name}..."
+    if repos.list_remote_packages.include?("#{package_name}/#{version_name}") 
+      puts "#{package_name}/#{version_name} has already been published"
+      if not options[:force]
+        puts "Use the --force option if you really want to overwrite, or us --publish-local for testing"
+        exit 1
+      else
+        puts "Overwriting..."
+      end
+    end
+  end
+  puts "Publishing #{package_name}/#{version_name}"
+  repos.publish_package(publish_statements, package_name, version_name, options[:publish_local])
 elsif options[:echo]
   puts env[options[:echo]]
 elsif shell_command

data/lib/fig/options.rb

@@ -39,6 +39,12 @@ module Fig
       options[:publish] = nil
       opts.on('--publish PKG', 'install package in local and remote repositories') { |publish| options[:publish] = publish }
 
+      options[:publish_local] = nil
+      opts.on('--publish-local PKG', 'install package in local repositorie only') { |publish_local| options[:publish_local] = publish_local }
+
+      options[:force] = nil
+      opts.on('--force', 'force overwriting of an existing remote package version') { |force| options[:force] = force }
+
       options[:resources] =[]
       opts.on('--resource PATH', 'resource to include in package (when using --publish)') do |path| 
         options[:resources] << Resource.new(path) 

data/lib/fig/os.rb

@@ -38,7 +38,11 @@ module Fig
     NOT_FOUND = 4
     
     def download_list(url)
-      uri = URI.parse(url)
+      begin
+        uri = URI.parse(url)
+      rescue 
+        raise "Unable to parse url: '#{url}'"
+      end
       case uri.scheme
       when "ftp"
         ftp = Net::FTP.new(uri.host)
@@ -51,6 +55,19 @@ module Fig
         end
         ftp.close
         packages
+      when "ssh"
+        packages = []
+        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.each do |line|
+              parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').chomp().split('/')
+              packages << parts.join('/') if parts.size == 2
+            end
+          end
+        end
+        packages
       else
         raise "Protocol not supported: #{url}"
       end
@@ -106,7 +123,7 @@ module Fig
       case basename
       when /\.tar\.gz$/
         unpack_archive(dir, path)
-     when /\.tgz$/
+      when /\.tgz$/
         unpack_archive(dir, path)
       when /\.tar\.bz2$/
         unpack_archive(dir, path)
@@ -164,7 +181,6 @@ module Fig
     def copy(source, target)
       FileUtils.mkdir_p(File.dirname(target))
       FileUtils.copy_file(source, target)
-      target
     end
 
     def move_file(dir, from, to)

data/lib/fig/repository.rb

@@ -42,7 +42,7 @@ module Fig
       @os.download_list(@remote_repository_url)
     end
 
-    def publish_package(package_statements, package_name, version_name) 
+    def publish_package(package_statements, package_name, version_name, local_only) 
       temp_dir = temp_dir_for_package(package_name, version_name)
       @os.clear_directory(temp_dir)
       fig_file = File.join(temp_dir, ".fig")
@@ -63,15 +63,19 @@ module Fig
           else
             archive_local = statement.url
           end
-          @os.upload(archive_local, archive_remote, @remote_repository_user)
+          @os.upload(archive_local, archive_remote, @remote_repository_user) unless local_only
+          @os.copy(archive_local, local_dir_for_package(package_name, version_name) + "/" + archive_name)
+          if statement.is_a?(Archive)
+            @os.unpack_archive(local_dir_for_package(package_name, version_name), archive_name)
+          end
           statement.class.new(archive_name).unparse('')
         else
           statement.unparse('')
         end
       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)
+      @os.upload(fig_file, remote_fig_file_for_package(package_name, version_name), @remote_repository_user) unless local_only
+      @os.copy(fig_file, local_fig_file_for_package(package_name, version_name))
     end
 
     def bundle_resources(package_statements)

data/spec/fig_spec.rb

@@ -47,10 +47,7 @@ def fig(args, input=nil)
       $stderr.puts err
     end
   end
-  if $?.exitstatus != 0
-    raise "Command failed: #{$?.exitstatus}"
-  end
-  return out, err
+  return out, err, $?.exitstatus
 end
 
 describe "Fig" do
@@ -69,7 +66,7 @@ describe "Fig" do
   end
 
   it "append environment variable from command line" do
-    fig('-p PATH=foo -g PATH').should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}",""]
+    fig('-p PATH=foo -g PATH').should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}","",0]
   end
 
   it "append environment variable from fig file" do
@@ -78,11 +75,11 @@ describe "Fig" do
         add PATH=foo
       end
     END
-    fig('-g PATH', input).should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}",""]
+    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",""]
+    fig('-p XYZZY=foo -g XYZZY').should == ["foo","",0]
   end
 
   it "should ignore comments" do
@@ -105,7 +102,9 @@ describe "Fig" do
         set FOO=BAR
       end
     END
-    puts fig('--publish foo/1.2.3', input)
+    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
 
@@ -121,7 +120,9 @@ describe "Fig" do
         append PATH=@/tmp/bin
       end
     END
-    puts fig('--publish foo/1.2.3', input)
+    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
 
@@ -131,10 +132,50 @@ describe "Fig" do
     FileUtils.mkdir_p("tmp/bin")
     File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
     fail unless system "chmod +x tmp/bin/hello"
-    puts fig('--publish foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
+    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"
+    fail unless 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)
@@ -147,7 +188,7 @@ describe "Fig" do
         append FOOPATH=@/tmp/lib/hello
       end
     END
-    puts fig('--publish foo/1.2.3', input)
+    fig('--publish foo/1.2.3', input)
     input = <<-END
       retrieve FOOPATH->tmp/lib2/[package]
       config default
@@ -173,7 +214,7 @@ describe "Fig" do
         append FOOPATH=@/tmp/lib/hello2
       end
     END
-    puts fig('--publish foo/1.2.3', input)
+    fig('--publish foo/1.2.3', input)
     input = <<-END
       retrieve FOOPATH->tmp/lib2/[package]
       config default

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -05:00
+date: 2010-07-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libarchive
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 2
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: net-sftp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 0
@@ -63,9 +70,11 @@ dependencies:
   name: polyglot
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 2
@@ -77,9 +86,11 @@ dependencies:
   name: treetop
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -91,9 +102,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -105,9 +118,11 @@ dependencies:
   name: open4
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -139,6 +154,9 @@ files:
 - lib/fig/windows.rb
 - LICENSE
 - README.md
+- spec/fig_spec.rb
+- spec/spec_helper.rb
+- spec/win_spec.rb
 has_rdoc: true
 homepage: http://github.com/mfoemmel/fig
 licenses: []
@@ -149,23 +167,27 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..