fig 0.1.8 → 0.1.9

data/bin/fig

@@ -39,7 +39,7 @@ vars = {}
 ENV.each {|key,value| vars[key]=value }
 
 remote_url = nil
-if options[:update] || options[:publish] || options[:update_if_missing]
+if options[:update] || options[:publish] || options[:update_if_missing] || options[:list_remote]
   remote_url = ENV['FIG_REMOTE_URL']
   if remote_url.nil?
     $stderr.puts "Please define the FIG_REMOTE_URL environment variable" 
@@ -92,6 +92,30 @@ options[:cleans].each do |descriptor|
   repos.clean(package_name, version_name)    
 end
 
+if options[:list]
+  repos.list_packages.sort.each do |item|
+    puts item
+  end
+  exit 0
+end
+
+if options[:list_remote]
+  repos.list_remote_packages.sort.each do |item|
+    puts item
+  end
+  exit 0
+end
+
+if not options[:list_configs].empty?
+  options[:list_configs].each do |descriptor|
+    package_name, version_name = descriptor.split('/')
+    repos.read_local_package(package_name, version_name).configs.each do |config|
+      puts config.name
+    end
+  end
+  exit 0
+end
+
 if input
   package = Parser.new.parse_package(nil, nil, ".", input)
   if options[:retrieve]
@@ -107,13 +131,6 @@ else
   package = Package.new(nil, nil, ".", [])
 end
 
-if options[:list]
-  repos.list_packages.sort.each do |item|
-    puts item
-  end
-  exit 0
-end
-
 def shell_exec(cmd)
   exec(ENV['SHELL'], '-c', cmd.join(' '))
 end
@@ -141,8 +158,8 @@ elsif shell_command
 elsif argv[0]
   package_name, config_name, version_name = parse_descriptor(argv.shift)
   env.include_config(package, package_name, config_name, version_name)
-  env.execute_config(package, package_name, config_name, nil) { |cmd| shell_exec cmd }
+  env.execute_config(package, package_name, config_name, nil, argv) { |cmd| shell_exec cmd }
 elsif input
-  env.execute_config(package, nil, options[:config], nil) { |cmd| shell_exec cmd }
+  env.execute_config(package, nil, options[:config], nil, argv) { |cmd| shell_exec cmd }
 end
 

data/lib/fig/environment.rb

@@ -41,14 +41,14 @@ module Fig
       end
     end
 
-    def execute_config(base_package, package_name, config_name, version_name)
+    def execute_config(base_package, package_name, config_name, version_name, args)
       package = lookup_package(package_name || base_package.package_name, version_name)
       result = nil
       commands = package[config_name || "default"].commands
       with_environment do
         # todo nil check
         commands.each do |command|
-          result = yield expand_arg(command.command).gsub("@",package.directory).split(" ")
+          result = yield expand_arg("#{command.command} #{args.join(' ')}").gsub("@",package.directory).split(" ")
         end
       end
       result

data/lib/fig/grammar.treetop

@@ -12,7 +12,7 @@ grammar Fig
   end
 
   rule package_statement
-    archive / resource / retrieve / config / publish 
+    archive / resource / retrieve / config
   end
 
   rule archive
@@ -39,23 +39,6 @@ grammar Fig
     }
   end
 
-  rule publish
-    "publish" ws local_name:config_name ("->" remote_name:config_name)? ws {
-      def 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
-
   rule install
     "install" ws statements:config_statement* "end" ws {
       def to_package_statement

data/lib/fig/options.rb

@@ -52,6 +52,12 @@ module Fig
       options[:list] = false
       opts.on('--list', 'list packages in local repository') { options[:list] = true }
 
+      options[:list_remote] = false
+      opts.on('--list-remote', 'list packages in remote repository') { options[:list_remote] = true }
+
+      options[:list_configs] = []
+      opts.on('--list-configs PKG', 'list configurations in package') { |descriptor| options[:list_configs] << descriptor }
+
       options[:cleans] = []
       opts.on('--clean PKG', 'remove  package from local repository') { |descriptor| options[:cleans] <<  descriptor }
 

data/lib/fig/os.rb

@@ -29,6 +29,28 @@ module Fig
    NOT_MODIFIED = 3
    NOT_FOUND = 4
 
+   def download_list(url)
+     uri = URI.parse(url)
+     case uri.scheme
+     when "ftp"
+       ftp = Net::FTP.new(uri.host)
+       ftp.login
+       dirs = [] 
+       ftp.list("-1 " + uri.path) do |line|
+         dirs << line
+       end
+       packages = []
+       dirs.each do |dir|
+         ftp.list("-1 #{uri.path}/#{dir}") do |line|
+           packages << "#{dir}/#{line}"
+         end
+       end
+       packages
+    else
+       raise "Protocol not supported: #{url}"
+    end
+   end
+
    def download(url, path)
      FileUtils.mkdir_p(File.dirname(path))
      uri = URI.parse(url)
@@ -115,10 +137,37 @@ module Fig
    def upload(local_file, remote_file, user)
      puts "uploading #{local_file} to #{remote_file}"
      uri = URI.parse(remote_file)
-     if uri.scheme == "ssh"
+     case uri.scheme
+     when "ssh"
        dir = uri.path[0, uri.path.rindex('/')]
        cmd = "mkdir -p #{dir} && cat > #{uri.path}"
        fail unless system "cat #{local_file} | ssh #{uri.user + '@' if uri.user}#{uri.host} '#{cmd}'"
+     when "ftp"
+#      fail unless system "curl -T #{local_file} --create-dirs --ftp-create-dirs #{remote_file}"
+       require 'net/ftp'
+       ftp_uri = URI.parse(ENV["FIG_REMOTE_URL"])
+       ftp_root_path = ftp_uri.path
+       ftp_root_dirs = ftp_uri.path.split("/")
+       remote_publish_path = uri.path[0, uri.path.rindex("/")]
+       remote_publish_dirs = remote_publish_path.split("/")
+       # Use array subtraction to deduce which project/version folder to upload to,
+       # i.e. [1,2,3] - [2,3,4] = [1]
+       remote_project_dirs = remote_publish_dirs - ftp_root_dirs
+       Net::FTP.open(uri.host) do |ftp|
+         ftp.login
+         # Assume that the FIG_REMOTE_URL path exists.
+         ftp.chdir(ftp_root_path)
+         remote_project_dirs.each do |dir|
+           # Can't automatically create parent directories, so do it manually.
+           if ftp.nlst().index(dir).nil?
+             ftp.mkdir(dir)
+             ftp.chdir(dir)
+           else
+             ftp.chdir(dir)
+           end
+         end
+         ftp.putbinaryfile(local_file)
+       end
      else
        fail unless system "curl -p -T #{local_file} --create-dirs --ftp-create-dirs #{remote_file}"
      end

data/lib/fig/package.rb

@@ -16,11 +16,16 @@ module Fig
       raise "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
     end
 
+    def configs
+      @statements.select { |statement| statement.is_a?(Configuration) }
+    end
+
     def retrieves
       retrieves = {}
       statements.each { |statement| retrieves[statement.var] = statement.path if statement.is_a?(Retrieve) }
       retrieves
     end
+
     def archive_urls
       @statements.select{|s| s.is_a?(Archive)}.map{|s|s.url}
     end

data/lib/fig/repository.rb

@@ -10,6 +10,14 @@ module Fig
       @update = update
       @update_if_missing = update_if_missing
       @parser = Parser.new
+
+      @overrides = {}
+      if File.exist?('fig.properties')
+        File.readlines('fig.properties').each do |line|
+          descriptor, path = line.strip.split('=')
+          @overrides[descriptor] = path
+        end
+      end
     end
 
     def clean(package_name, version_name) 
@@ -20,19 +28,24 @@ module Fig
 
     def list_packages
       results = []
-      @os.list(@local_repository_dir).each do |package_name|
-        @os.list(File.join(@local_repository_dir, package_name)).each do |version_name|
-          results << "#{package_name}/#{version_name}"
+      if File.exist?(@local_repository_dir)
+        @os.list(@local_repository_dir).each do |package_name|
+          @os.list(File.join(@local_repository_dir, package_name)).each do |version_name|
+            results << "#{package_name}/#{version_name}"
+          end
         end
       end
       results
     end
 
+    def list_remote_packages
+      @os.download_list(@remote_repository_url)
+    end
+
     def publish_package(package_statements, package_name, version_name) 
       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?(Publish)
           nil
@@ -52,13 +65,6 @@ 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
@@ -68,13 +74,6 @@ module Fig
 #      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|
@@ -120,7 +119,14 @@ module Fig
     end
 
     def read_package_from_directory(dir, package_name, version_name)
-      read_package_from_file(File.join(dir, ".fig"), package_name, version_name)
+      file = File.join(dir, ".fig")
+      if not File.exist?(file)
+        file = File.join(dir, "package.fig")
+      end
+      if not File.exist?(file)
+        raise "File not found: #{file}"
+      end
+      read_package_from_file(file, package_name, version_name)
     end
 
     def read_package_from_file(file_name, package_name, version_name)
@@ -134,7 +140,14 @@ module Fig
     end
 
     def local_dir_for_package(package_name, version_name)
-      File.join(@local_repository_dir, package_name, version_name)
+      descriptor = "#{package_name}/#{version_name}"
+      dir = @overrides[descriptor]
+      if dir
+        $stderr.puts "override: #{descriptor}=#{dir}"
+      else
+        dir = File.join(@local_repository_dir, package_name, version_name)
+      end
+      dir
     end
 
   private

data/spec/fig_spec.rb

@@ -84,7 +84,6 @@ describe "Fig" do
     FileUtils.rm_rf(FIG_HOME)
     FileUtils.rm_rf(FIG_REMOTE_DIR)
     input = <<-END
-      publish default
       config default
         set FOO=BAR
       end
@@ -100,9 +99,8 @@ 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 test
+      config default
         append PATH=@/tmp/bin
       end
     END
@@ -127,7 +125,6 @@ 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.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -06:00
+date: 2010-01-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency