depends-client 0.2.0.beta3 → 0.2.0

data/README.md

@@ -15,37 +15,56 @@ Depends is quite simple.
 ```bash
 gem install depends-client
 ```
-2. Setup ~/.depends/config.rb
 
-```ruby
-depend config --key <your key here>
-```
-
-3. Define a Depends file at the root of your source repository. The format is as follows:
-    As of this release <code>source</code> is not longer necessary. The default location is always used.
+2. Define a Depends file at the root of your source repository. The format is as follows:
 
     ```ruby
-    depend 'Qt', version: '4', destination: 'External/Qt'
-    depend 'SevenZipSharp', version: '4', destination: 'External/SevenZipSharp'
-    depend 'Sqlite', version: '4', destination: 'External/Sqlite'
-    depend 'Xerces', version: '4', destination: 'External/Xerces'
-    depend 'Xsd', version: '4', destination: 'External/Xsd'
+
+    source :depends
+
+    depend 'Qt', :version => '4', :destination => 'External/Qt'
+    depend 'SevenZipSharp', :version => '4', :destination => 'External/SevenZipSharp'
+    depend 'Sqlite', :version => '4', :destination => 'External/Sqlite'
+    depend 'Xerces', :version => '4', :destination => 'External/Xerces'
+    depend 'Xsd', :version => '4', :destination => 'External/Xsd'
 
     ```
 
+    _source_ defines that location of the depends server. Currently :local, :depends, or a string to some other depends
+    server, i.e. http://example.com.
+
     _depend_ defines what the dependency is, the version to install and the path to unpack it to
 
-4. Execute Depends
+3. Execute Depends
 ```bash
 depend
 ```
 
-5. Add your Depends file to source control
+4. Add your Depends file to source control
 
 _We also recomend that you add depends destinations to your gitignore and hgignore files._
 
-You're done! Packages are downloaded, extracted and installed per the instructions in your gem file.
+Your done, packages are download, extracted and installed per the instructions in your gem file
+
+
+Uploading A Dependency
+----------------------
+This tutorial does not cover installing a depends server, but asuming that you have a depends server setup, adding a new
+dependency is simple.
+
+1. Install Depends
+
+    ```bash
+    gem install depends
+    ````
+2. Setup a directory that models what you want to upload. I.e. Create /tmp/openssl and add some files to it.
+3. Package and upload
+
+    ```bash
+    depend upload -s /tmp/openssl -d 'depends' -n "OpenSSL" -v '1.2.3b'
+    ```
 
+That's it, your package is created and uploaded to the depends server.
 
 The Future
 ==========

data/bin/depends

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'depends'
+time = Benchmark.realtime do
+  begin
+    a = Depends::CommandFactory.build.new
+    a.run
+  rescue Depends::Exceptions::SubCommandMissing => e
+    Depends::Log.debug ("Exception: #{e.inspect}")
+    Depends::Log.fatal ("SubCommand is not defined #{e.message}")
+    Process.exit 1
+  end
+end
+
+Depends::Log.debug ":total_runtime => #{time*1000} milliseconds"
+
+

data/lib/depends.rb

@@ -4,9 +4,19 @@ require 'net/http'
 require 'json'
 require 'fileutils'
 require 'logger'
+require 'mixlib/log'
+require 'mixlib/config'
+require 'mixlib/cli'
 require 'digest/sha1'
 require 'multi_json'
-require 'mixlib/config'
+
+if RUBY_PLATFORM =~ /mingw32|mswin32/
+  unless Gem.available?('win32-dir')
+    `gem install win32-dir`
+    Gem.clear_paths
+  end
+  require 'win32/dir'
+end
 
 require 'depends/exceptions'
 require 'depends/config'
@@ -14,9 +24,11 @@ require 'depends/util'
 require 'depends/rest_client'
 require 'depends/dsl/depend'
 require 'depends/definition'
-require 'terminal-table'
+require 'depends/log/formatter'
+require 'depends/log'
+require 'depends/command_factory'
 
+require 'depends/commands/base'
 require 'depends/commands/install'
 require 'depends/commands/list'
-require 'depends/commands/versions'
 require 'depends/commands/upload'

data/lib/depends/command_factory.rb

@@ -0,0 +1,31 @@
+module Depends
+  module CommandFactory
+    class << self
+      def build
+        subcommand_class
+      end
+
+      private
+      def subcommand_class
+        command_words = ARGV.select {|arg| arg =~ /^(([[:alnum:]])[[:alnum:]\_\-]+)$/ }
+        if command_words.empty?
+          return Depends::Commands::Install
+        end
+        command_words.collect! {|word| word.titleize }
+        command_options = []
+        subcommand_class = nil
+
+        while ( !subcommand_class ) && ( !command_words.empty? )
+          constant_case_name = command_words.join('')
+          command_options << constant_case_name
+          command_constant = Depends::Commands.constants.select { |i| i.eql? constant_case_name.to_sym}
+          unless command_constant.empty?
+            return "Depends::Commands::#{constant_case_name}".constantize
+          end
+          command_words.pop
+        end
+        raise Depends::Exceptions::SubCommandMissing, "Possible SubCommands: #{command_options} "
+      end
+    end
+  end
+end

data/lib/depends/commands/base.rb

@@ -0,0 +1,87 @@
+module Depends
+  module Commands
+    class Base
+
+      include Mixlib::CLI
+
+      def initialize
+        super
+
+        trap("TERM") do
+          Depends::Commands::Base.fatal!("SIGTERM received, stopping", 1)
+        end
+
+        trap("INT") do
+          Depends::Commands::Base.fatal!("SIGINT received, stopping", 2)
+        end
+
+        processor, platform, *rest = RUBY_PLATFORM.split("-")
+
+        unless RUBY_PLATFORM =~ /mingw32|mswin32/
+          trap("QUIT") do
+            Depends::Log.info("SIGQUIT received, call stack:\n  " + caller.join("\n  "))
+          end
+
+          trap("HUP") do
+            Depends::Log.info("SIGHUP received, reconfiguring")
+            reconfigure
+          end
+        end
+
+      end
+
+      def reconfigure
+        parse_options
+        configure_depends
+        configure_logging
+      end
+
+      def run
+        reconfigure
+        setup_application
+        run_application
+      end
+
+
+      private
+      def configure_depends
+
+        if File.exist?('~/.depends')
+          Depends::Log.info "Loading config file from '~/.depends'"
+          Depends::Config.from_file('~/.depends')
+        end
+
+        FileUtils.mkdir_p Depends::Config.cache
+      end
+
+      def configure_logging
+        Depends::Log.formatter = Depends::Log::Formatter.new
+        Depends::Log.level = config[:log_level] || Logger::INFO
+      end
+
+      # Called prior to starting the application, by the run method
+      def setup_application
+        raise Depends::Exceptions::Application, "#{self.to_s}: you must override setup_application"
+      end
+
+      # Actually run the application
+      def run_application
+        raise Depends::Exceptions::Application, "#{self.to_s}: you must override run_application"
+      end
+
+      class << self
+
+        # Log a fatal error message to both STDERR and the Logger, exit the application
+        def fatal!(msg, err = -1)
+          Depends::Log.fatal(msg)
+          Process.exit err
+        end
+
+        def exit!(msg, err = -1)
+          Depends::Log.debug(msg)
+          Process.exit err
+        end
+      end
+    end
+  end
+end

data/lib/depends/commands/install.rb

@@ -1,20 +1,21 @@
+require 'benchmark'
 module Depends
   module Commands
-    class Install 
+    class Install < Depends::Commands::Base
 
-      def run
+      banner "Install dependencies"
 
-        if RUBY_PLATFORM =~ /mingw32|mswin32/
-          begin 
-            require 'win32/dir'
-          rescue LoadError
-            color("Failed to require win32/dir, please make sure the gem is installed or in your bundle",:red) 
-            exit(1)
-          end
-        end
+      option :log_level,
+             :short => "-l LEVEL",
+             :long  => "--log_level LEVEL",
+             :description => "Set the log level (debug, info, warn, error, fatal)",
+             :proc => Proc.new { |l| l.downcase.to_sym }
 
-        Depends::Config.load
-        say 'Installing Dependencies...'
+      def setup_application
+        Log.info "Installing dependencies..."
+      end
+
+      def run_application
         check_for_file
         load_depends_file
         download_extract
@@ -25,7 +26,7 @@ module Depends
       private
       def check_for_file
         unless Dir.entries(Dir.pwd).include?('Depends')
-          color "Missing Depends file", :red
+          Depends::Log.error "Missing Depends file"
           exit 1
         end
       end
@@ -39,7 +40,7 @@ module Depends
           file = nil
         end
 
-        say "Updating #{file} with external dependencies..." if file
+        Depends::Log.info "Updating #{file} with external dependencies..." if file
         unless file.nil?
           FileUtils.touch(file) unless File.exist? file
           ignore_file = File.read(file)
@@ -49,12 +50,13 @@ module Depends
               ignore.delete(line.chomp)
             end
           end
-          File.open(file, 'a') do |f|
+          File.open(file, 'a') { |f|
             ignore.each do |i|
+              Depends::Log.debug "Adding #{i} to #{file}"
               f.puts ""
               f.puts i
             end
-          end
+          }
         end
       end
 
@@ -64,31 +66,31 @@ module Depends
 
 
       def load_depends_file
-        say "Loading Dependencies..."
+        Depends::Log.info "Loading Dependencies..."
         @def = Depends::DSL::Depend.evaluate('Depends')
         unless @def.unmet_dependencies.empty?
-          color "You have unmet dependencies in your sources, #{@def.unmet_dependencies.inspect}", :red
+          Depends::Log.fatal "You have unmet dependencies in your sources, #{@def.unmet_dependencies.inspect}"
           Process.exit 1
         end
       end
 
 
       def download_extract
-        say "Downloading and extracting missing dependencies..."
+        Depends::Log.info "Downloading and extracting missing dependencies..."
         @def.dependencies.each do |dep|
-          file_name = "#{Util.depend_name_with_version(dep)}.zip"
+          file_name = "#{dep[:name]}-#{dep['number']}.zip"
           cache_file =  File.join(Depends::Config.cache,file_name)
           cache_directory = File.join(Depends::Config.cache,File.basename(file_name,'.zip'))
 
           unless File.exist?(cache_file) # and Digest::SHA1.file(cache_file).to_s.eql? dep["sha1"]
-            say "Downloading #{dep[:name]}..."
+            Depends::Log.info "Downloading #{dep[:name]}..."
             just_downloaded = true
             dep[:source].download_depend_version(dep[:name],dep["number"])
           end
 
           if just_downloaded or not File.exist? cache_directory
-            say "Extracting #{cache_file}"
-            Util.un_zip(cache_file,cache_directory)
+            Depends::Log.info "Extracting #{cache_file}"
+            Util.un_zip(cache_file,cache_directory) unless config[:dry_run]
           end
 
         end
@@ -96,10 +98,10 @@ module Depends
 
       def link
         @def.dependencies.each do |dep|
-          source = File.join(Depends::Config.cache,File.basename(Util.depend_name_with_version(dep),'.zip'))
+          source = File.join(Depends::Config.cache,File.basename("#{dep[:name]}-#{dep['number']}",'.zip'))
           base_dir = File.dirname(dep[:destination])
           FileUtils.mkdir_p(base_dir) unless File.exist? base_dir
-          say "Linking #{source} to #{dep[:destination]}"
+          Depends::Log.info "Linking #{source} to #{dep[:destination]}"
 
           if RUBY_PLATFORM =~ /mingw32|mswin32/
             Dir.delete dep[:destination] if File.exist? dep[:destination]

data/lib/depends/commands/list.rb

@@ -1,19 +1,72 @@
-
+require 'benchmark'
 module Depends
   module Commands
-    class List 
+    class List < Depends::Commands::Base
+
+      banner "List dependencies"
+
+      option :log_level,
+             :short => "-l LEVEL",
+             :long  => "--log_level LEVEL",
+             :description => "Set the log level (debug, info, warn, error, fatal)",
+             :proc => Proc.new { |l| l.downcase.to_sym }
+      option :versions,
+             :short => "-d depend",
+             :long => "--depend d",
+             :description => "List the versions for a depend"
 
-      def run
-        Depends::Config.load
-        client = Depends::RestClient.new()
-        deps = client.list
-        headers = ['Name','Description']
-        rows = deps.collect{ |i| [i['name'] ,i['description']] }
-        table = Terminal::Table.new :title => "Dependencies", :headings => headers, :rows => rows
-        puts table
+      def setup_application
+        Log.info "Getting Depends from sources..."
+      end
+
+      def run_application
+        check_for_file
+        load_depends_file
+        if config[:versions]
+          results = []
+          @def.sources.each do |source|
+            source_index = results.count
+            results[source_index] = {:source => source.source_url, :versions => []}
+            begin 
+              dep = source.get_depend(config[:versions])
 
+              dep['versions'].each do |version|
+                results[source_index][:versions] << version.keep_if { |key| ['number','notes','publisher','sha1'].include?(key) }
+              end
+            rescue Nestful::ResourceNotFound
+              puts "  Depend not found on source"
+            end
+            puts results.to_yaml
+          end
+        else
+          results = []    
+          @def.sources.each do |source|
+            source_index = results.count
+            results[source_index] = {:source => source.source_url, :depends => []}
+            source.list.each do |d|
+              results[source_index][:depends] << d.keep_if { |key| ['name','description'].include?(key) }
+            end    
+          end
+          results.each do |r| 
+            r[:depends].sort_by! { |h| h['name']}
+          end
+          puts results.to_yaml
+        end
       end
-      
+
+      private
+      def check_for_file
+        unless Dir.entries(Dir.pwd).include?('Depends')
+          Depends::Log.error "Missing Depends file"
+          exit 1
+        end
+      end
+
+
+      def load_depends_file
+        @def = Depends::DSL::Depend.evaluate('Depends')
+      end
+
     end
   end
 end

data/lib/depends/commands/upload.rb

@@ -1,51 +1,88 @@
 module Depends
   module Commands
-    class Upload
+    class Upload < Depends::Commands::Base
 
+      class UploadConfig
+        extend(Mixlib::Config)
+      end
 
-      def run(options)
-        Depends::Config.load
-        client = Depends::RestClient.new
-        puts "CREATE: #{options.create}"
+      banner "Upload a dependency to a depends server"
 
-        begin
-          @dep = client.get_depend(options.dep)
-        rescue Nestful::ResourceNotFound => e
-          if options.create
-            say("Creating dependency")
-            @dep = client.create_depend(options.dep,options.description)
+      option :source,
+             :short => "-s source",
+             :long  => "--source source",
+             :description => "Source directory for dependency",
+             :required => true
+      option :key,
+             :short => "-k key",
+             :long  => "--key key",
+             :description => "The API Key to use for upload",
+             :required => true
 
-          else
-            color("Dependency does not exist and --create flag was not specified", :red)
-            exit 1
-          end
-        end
+      option :description,
+             :short => "-e description",
+             :long => "--description description",
+             :required => false
 
-        file = build_package(options)
-        sha1 = Digest::SHA1.file(file).to_s
+      option :name,
+             :short => "-n name",
+             :long  => "--name name",
+             :description => "Dependency Name",
+             :required => true
+
+      option :version,
+             :short => "-v version",
+             :long  => "--version version",
+             :description => "Version to publish",
+             :required => true
+
+      option :destination,
+             :short => "-d destination",
+             :long  => "--destination destination",
+             :description => "Destination to publish depend to",
+             :default => 'https://depends.io',
+             :proc => Proc.new { |o|
+               Depends::Util.depends_source o
+             }
 
-        if @dep['versions'].select { |v| v.eql? options.num }.empty?
-          puts "File #{file}"
-          puts "SHA #{sha1}"
-          puts "Number #{options.num}"
-          begin
-            client.create_version(@dep['name'], :file => file, :sha1 => sha1, :number => options.num)
-          rescue Nestful::BadRequest => e
-            color(e.response.body, :red)
+      option :log_level,
+             :short => "-l LEVEL",
+             :long  => "--log_level LEVEL",
+             :description => "Set the log level (debug, info, warn, error, fatal)",
+             :proc => Proc.new { |l| l.downcase.to_sym }
+
+      def setup_application
+
+      end
+
+      def run_application
+        client = Depends::RestClient.new(config[:destination])
+        client.api_key = config[:key]
+
+        begin
+          Log.info "Getting Depend"
+          @dep = client.get_depend(config[:name])
+        rescue Nestful::ResourceNotFound => e
+          if config[:description].nil?
+            Log.fatal("Depends does not exist, you must specify a description") 
+            exit(1)
           end
-        else
-          color("Dependency already exists!", :red)
+          Log.info "Creating Depends"
+          @dep = client.create_depend(config[:name],config[:description])
         end
+        file = build_package
+        sha1 = Digest::SHA1.file(file).to_s
+        client.create_version(config[:name], :file => file, :sha1 => sha1, :number => config[:version])
       end
 
       private
 
-      def build_package(options)
+      def build_package
         upload_dir = File.join(Depends::Config.cache,'upload')
-        FileUtils.mkdir_p upload_dir
-        dest_file = File.join(upload_dir, "#{options.dep}-#{options.num}.zip")
-        FileUtils.rm_f
-        source_path = File.expand_path(options.source)
+        FileUtils.mkdir_p upload_dir unless File.exist? upload_dir
+        dest_file = File.join(upload_dir, "#{config[:name]}-#{config[:version]}.zip")
+        FileUtils.rm dest_file if File.exist? dest_file
+        source_path = File.expand_path(config[:source])
         Zip::ZipFile.open(dest_file, Zip::ZipFile::CREATE) { |zipfile|
           Dir["#{source_path}/**/*"].each do |file|
             relative_path = file.to_s.gsub(source_path, '')

data/lib/depends/config.rb

@@ -2,16 +2,6 @@ module Depends
   class Config
     extend(Mixlib::Config)
 
-    cache File.expand_path('~/.depends')
-    api_key ''
-    server 'https://depends.aws.af.cm'
-
-    def self.load(file = '~/.depends/config.rb')
-        config_file = File.expand_path(file)
-        Depends::Config.from_file(config_file)
-    rescue
-      color("Failed to load config file, please run 'depend config'", :red)
-      exit(1)
-    end
-  end 
-end
+    cache File.expand_path('~/.depends_cache')
+  end
+end

data/lib/depends/definition.rb

@@ -5,6 +5,7 @@ module Depends
     attr_reader :sources
     attr_reader :dependencies
     attr_reader :unmet_dependencies
+    attr_reader :default_source
 
     def initialize(sources,dependencies, options ={})
       @sources = sources
@@ -14,6 +15,7 @@ module Depends
     def map(deps)
       @dependencies = []
       @unmet_dependencies = []
+      Log.debug " :definition => #{@def.inspect}"
       deps.each do |dep|
         dependency_met = false
         sources.each do |source|
@@ -22,10 +24,11 @@ module Depends
             server_dep[:source] = source
             server_dep[:destination] = dep[:destination]
             server_dep[:name] = dep[:name]
+            Log.debug ":server_dep => #{server_dep}"
             @dependencies << server_dep
             dependency_met = true
           rescue Nestful::ResourceNotFound => e
-            
+            Log.debug ":resource_not_found => #{e.inspect}"
           end
         end
 

data/lib/depends/dsl/depend.rb

@@ -13,7 +13,7 @@ module Depends
       end
 
       def initialize
-        @sources         = [Depends::RestClient.new]
+        @sources         = []
         @dependencies    = []
       end
 
@@ -33,22 +33,26 @@ module Depends
       end
 
       def source(source, options = {})
-        color("source is a depreciated dsl option", :yellow)
+          depends_source Depends::Util.depends_source(source)
       end
 
-      def key(*args)
-        color("key is a depreciated dsl option", :yellow)
+      def default
+        @default ||= @sources.last
+      end
+
+      def key(api_key)
+        @sources.last.api_key = api_key
       end
 
       def to_definition
         @sources.uniq!
-        raise DslError, "No source specified! Try source :bigdepends" unless @sources.length > 0
+        raise DslError, "No source specified! Try source :depends" unless @sources.length > 0
         Depends::Definition.new(@sources, @dependencies)
       end
 
       private
       def depends_source(source)
-        
+        @sources << Depends::RestClient.new(source)
       end
 
     end

data/lib/depends/log.rb

@@ -0,0 +1,6 @@
+module Depends 
+  class Log
+    extend Mixlib::Log
+  end
+end
+

data/lib/depends/log/formatter.rb

@@ -0,0 +1,41 @@
+require 'logger'
+require 'time'
+
+module Depends
+  class Log
+    class Formatter < Logger::Formatter
+      @@show_time = false
+
+      COLOR_MAP = {'DEBUG' =>'0;37', 'INFO'=>'32', 'WARN'=>'33', 'ERROR'=>'31', 'FATAL'=>'31', 'UNKNOWN'=>'37'}
+
+      def self.show_time=(show=false)
+        @@show_time = show
+      end
+
+      def call(severity, time, progname, msg)
+        color = COLOR_MAP[severity]
+
+        if @@show_time
+          sprintf("\033[0;37m%s \033[0m[\033[#{color}m%s\033[0m]: \033[0m%s\n", time.rfc2822(), severity, msg2str(msg))
+        else
+          sprintf("\033[#{color}m%s\033[0;37m: \033[0m%s\n", severity, msg2str(msg))
+        end
+      end
+      
+      # Converts some argument to a Logger.severity() call to a string.  Regular strings pass through like
+      # normal, Exceptions get formatted as "message (class)\nbacktrace", and other random stuff gets 
+      # put through "object.inspect"
+      def msg2str(msg)
+        case msg
+        when ::String
+          msg
+        when ::Exception
+          "#{ msg.message } (#{ msg.class })\n" <<
+            (msg.backtrace || []).join("\n")
+        else
+          msg.inspect
+        end
+      end
+    end
+  end
+end

data/lib/depends/rest_client.rb

@@ -5,16 +5,18 @@ module Depends
   class RestClient
 
     attr_accessor :source_url
+    attr_accessor :api_key
     attr_reader :cache
 
-    def initialize
-      @source_url = Depends::Config.server
-      cache_path = File.join(Depends::Config.cache,'rest',URI.parse(source_url.to_s).host )
+    def initialize(source)
+      @source_url = source
+      cache_path = File.join(Depends::Config.cache,'rest',URI.parse(source.to_s).host )
+      Depends::Log.debug ":cache_path => #{cache_path}"
       @cache = ActiveSupport::Cache::FileStore.new(cache_path, :expires_in => 1.day)
     end
 
     def headers
-      {'key' => Depends::Config.api_key}
+      {'key' => api_key}
     end
 
     def create_version(name,options = {})
@@ -28,13 +30,22 @@ module Depends
 
     def get_depend(name)
       uri = "#{source_url}/depends/#{name}"
-      depend = Nestful.get uri, :format => :json,  :headers => headers
+      #depend = cache.read(uri)
+      #if depend.nil?
+        depend = Nestful.get uri, :format => :json,  :headers => headers
+        #cache.write(uri,depend.to_json)
+      #else
+      #  depend = ::MultiJson.load(depend)
+      #end
       depend
     end
 
     def download_depend_version(name,version)
       dest_file = File.join(Depends::Config.cache, "#{name}-#{version}.zip")
-      uri = get_downlad_uri(name,version)
+      Log.info "#{source_url}/depends/#{name}/version/#{version}/download"
+
+      request = Nestful.get "#{source_url}/depends/#{name}/version/#{version}/download.url",  :headers => headers
+      uri = URI.parse(request)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -51,13 +62,13 @@ module Depends
             size += chunk.size
             new_progress = (size * 100) / total
             unless new_progress == progress
-              say "\rDownloading %s (%3d%%) " % [name, new_progress]
+              Log.info "\rDownloading %s (%3d%%) " % [name, new_progress]
             end
             progress = new_progress
           end
 
           temp_file.close
-          FileUtils.rm_f dest_file
+          File.unlink dest_file if File.exists?(dest_file)
           FileUtils.mkdir_p File.dirname(dest_file)
           FileUtils.mv temp_file.path, dest_file, :force => true
       end
@@ -82,16 +93,18 @@ module Depends
 
 
     def get_dep_version(name,version)
+      Depends::Log.debug "[get] :ver => #{version}"
       uri = "#{source_url}/depends/#{name}/version/#{version}"
-      depend = Nestful.get uri, :format => :json,  :headers => headers
+      #depend = cache.read(uri)
+      #if depend.nil?
+        depend = Nestful.get uri, :format => :json,  :headers => headers
+        #cache.write(uri,depend.to_json)
+      #else
+      #  depend = ::MultiJson.load(depend)
+      #end
       depend
     end
 
-    private
-    def get_downlad_uri(name,version)
-      request = Nestful.get "#{source_url}/depends/#{name}/version/#{version}/download.url",  :headers => headers
-      uri = URI.parse(request)
-    end
 
   end
 end

data/lib/depends/util.rb

@@ -5,12 +5,14 @@ module Depends
 
     def self.un_zip(source,destination, options = {})
       options.reverse_merge!({:overwrite => true})
-      say "Opening #{source}"
+      Log.debug "Opening #{source}"
       Zip::ZipFile.open(source) do |zip|
         zip.each do |entry|
+          Log.debug (":entry => #{entry.name}")
           path = ::File.join(destination, entry.name)
           FileUtils.mkdir_p(::File.dirname(path))
           if options[:overwrite] && ::File.exists?(path) && !::File.directory?(path)
+            Log.debug("Removing #{path}")
             FileUtils.rm(path)
           end
           zip.extract(entry, path)
@@ -25,14 +27,10 @@ module Depends
         when :local
           "http://localhost:8080"
         when :depends
-          "http://depends.io"
+          "https://depends.cloudfoundry.com/"
         else
           source
       end
     end
-
-    def self.depend_name_with_version(dep)
-      "#{dep[:name]}-#{dep['number']}"
-    end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: depends-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta3
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Chris Roby
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nestful
+  name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: nestful
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,15 +43,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: rack-cache
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,59 +107,62 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: rack-cache
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 description: 
 email:
 - croby@biaprotect.com
 - pmorton@biaprotect.com
 executables:
-- depend
+- depends
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/depend
-- lib/depends/cli.rb
+- bin/depends
+- lib/depends/command_factory.rb
+- lib/depends/commands/base.rb
 - lib/depends/commands/install.rb
 - lib/depends/commands/list.rb
 - lib/depends/commands/upload.rb
-- lib/depends/commands/versions.rb
 - lib/depends/config.rb
 - lib/depends/definition.rb
 - lib/depends/dsl/depend.rb
 - lib/depends/exceptions.rb
+- lib/depends/log/formatter.rb
+- lib/depends/log.rb
 - lib/depends/rest_client.rb
+- lib/depends/server.rb
 - lib/depends/util.rb
 - lib/depends.rb
 - LICENSE
@@ -179,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/bin/depend

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'depends'
-require 'depends/cli'
-
-

data/lib/depends/cli.rb

@@ -1,83 +0,0 @@
-require 'commander/import'
-
-# :name is optional, otherwise uses the basename of this executable
-program :name, 'depends'
-program :version, '0.2.0'
-program :description, 'Simple binary dependency management '
-
-command :install do |c|
-  c.syntax = 'install'
-  c.description = 'Install application dependencies'
-  c.action do |args,options|
-    Depends::Commands::Install.new.run
-  end
-end
-
-
-command :list do |c|
-  c.syntax = 'list'
-  c.description = 'List application dependencies'
-  c.action do |args,options|
-    Depends::Commands::List.new.run
-  end
-end
-
-command :versions do |c|
-  c.syntax = 'versions'
-  c.description = 'List version if an application'
-  c.action do |args,options|
-    Depends::Commands::Versions.new.run(args)
-  end
-end
-
-
-command :upload do |c|
-  c.syntax = 'upload'
-  c.description = 'Upload a dependency to the server'
-  c.option '--source DIR', String, 'Directory to be uploaded'
-  c.option '--name NAME', String, 'Name of the dependency'
-  c.option '--num VERSION', String, 'Version String'
-  c.option '--create','Create if does not exist'
-  c.option '--description', String, 'Description of the dependency'
-  c.action do |args,options|
-
-    options.source = ask("Source Directory: ") unless options.source
-    options.name = ask("Dependency Name: ") unless options.dep
-    options.num = ask("Version Number: ") unless options.num
-    options.description = ask("Description:") if not options.description and options.create
-
-    Depends::Commands::Upload.new.run(options)
-  end
-end
-
-command :config do |c|
-  c.syntax = 'config'
-  c.description = 'Configure the depends client'
-  c.option '--key KEY', String, 'The key to use to access the depends server'
-  c.option '--server SERVER', String, 'The URL of the depends server'
-  c.option '--cache CACHE', String, 'The path to the folder to use for caching dependencies'
-  c.option '--overwrite','Overwrite an existing config file'
-
-  c.action do |args,options|
-    config_file = File.expand_path( '~/.depends/config.rb' )
-    config_dir = File.dirname(config_file)
-
-    if File.exists? config_file and not options.overwrite
-      say("Your configuration already exists, please specify --overwrite if you wish to overwrite the existing config")
-      exit(1)
-    end
-
-    options.key = ask("Depends server key ") unless options.key
-
-    config_content = ''
-    config_content << "api_key '#{options.key}'"
-    config_content << "server '#{options.server}" if options.server
-    config_content << "cache '#{options.cache}'" if options.cache
-
-    Dir.mkdir config_dir unless File.directory? config_dir
-
-    file = File.new(config_file,'w+')
-    file.write(config_content) 
-
-  end
-end

data/lib/depends/commands/versions.rb

@@ -1,19 +0,0 @@
-
-module Depends
-  module Commands
-    class Versions 
-
-      def run(depend)
-        Depends::Config.load
-        client = Depends::RestClient.new()
-        dep = client.get_depend(depend[0])
-
-        headers = ['Version Number','SHA1', 'Publisher Address']
-        rows = dep['versions'].collect{ |i| [i['number'] ,i['sha1'],i['publisher']] }
-        table = Terminal::Table.new :title => "Versions for #{depend[0]}", :headings => headers, :rows => rows
-        puts table
-      end
-      
-    end
-  end
-end