depends-client 0.1 → 0.2.0.beta1

data/README.md

@@ -15,13 +15,17 @@ Depends is quite simple.
 ```bash
 gem install depends-client
 ```
+2. Setup ~/.depends/config.rb
 
-2. Define a Depends file at the root of your source repository. The format is as follows:
-
-    ```ruby
+```ruby
+api_key '<YOUR KEY HERE>'
+server 'https://depends.aws.af.cm'
+```
 
-    source :depends
+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.
 
+    ```ruby
     depend 'Qt', :version => '4', :destination => 'External/Qt'
     depend 'SevenZipSharp', :version => '4', :destination => 'External/SevenZipSharp'
     depend 'Sqlite', :version => '4', :destination => 'External/Sqlite'
@@ -30,46 +34,24 @@ gem install depends-client
 
     ```
 
-    _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
 
-3. Execute Depends
+4. Execute Depends
 ```bash
 depend
 ```
 
-4. Add your Depends file to source control
+5. Add your Depends file to source control
 
 _We also recomend that you add depends destinations to your gitignore and hgignore files._
 
 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
 ==========
 * Polish the client a bit further
 * Better error handling
-* Auto Updating of .gitignore and .hgignore files based on your Depends
+* <s>Auto Updating of .gitignore and .hgignore files based on your Depends</s>
 * Windows support
 * Rake tasks

data/bin/depend

@@ -1,17 +1,6 @@
 #!/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"
+require 'depends/cli'
 
 

data/lib/depends/cli.rb

@@ -0,0 +1,51 @@
+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

data/lib/depends/commands/configure.rb

@@ -0,0 +1,9 @@
+module Depends
+  module Commands
+    class Configure
+      def run
+        Depends::Config.load
+      end
+    end
+  end
+end

data/lib/depends/commands/install.rb

@@ -1,77 +1,85 @@
 require 'benchmark'
 module Depends
   module Commands
-    class Install < Depends::Commands::Base
-
-      banner "Install 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 }
-
-      def setup_application
-        Log.info "Installing dependencies..."
+    class Install 
+
+      def run
+        Depends::Config.load
+        say 'Installing Dependencies...'
+        check_for_file
+        load_depends_file
+        download_extract
+        link
+        update_ignores
       end
 
-      def run_application
-
-        time = Benchmark.realtime do
-          check_for_file
-        end
-        Depends::Log.debug ":check_for_file => #{time*1000} milliseconds"
-
-        time = Benchmark.realtime do
-          load_depends_file
+      private
+      def check_for_file
+        unless Dir.entries(Dir.pwd).include?('Depends')
+          color "Missing Depends file", :red
+          exit 1
         end
-        Depends::Log.debug ":load_depends_file => #{time*1000} milliseconds"
+      end
 
-        time = Benchmark.realtime do
-          download_extract
+      def update_ignores
+        if File.exist?('.git')
+          file = '.gitignore'
+        elsif File.exists?('.hg')
+          file = '.hgignore'
+        else
+          file = nil
         end
-        Depends::Log.debug ":download_extract => #{time*1000} milliseconds"
 
-        time = Benchmark.realtime do
-          link
+        say "Updating #{file} with external dependencies..." if file
+        unless file.nil?
+          FileUtils.touch(file) unless File.exist? file
+          ignore_file = File.read(file)
+          ignore = files_to_ignore
+          ignore_file.each_line do |line|
+            if ignore.include? line.chomp
+              ignore.delete(line.chomp)
+            end
+          end
+          File.open(file, 'a') { |f|
+            ignore.each do |i|
+              f.puts ""
+              f.puts i
+            end
+          }
         end
-        Depends::Log.debug ":link => #{time*1000} milliseconds"
-
       end
 
-      private
-      def check_for_file
-        unless Dir.entries(Dir.pwd).include?('Depends')
-          Depends::Log.error "Missing Depends file"
-          exit 1
-        end
+      def files_to_ignore
+        @def.dependencies.collect { |d| d[:destination] }
       end
 
+
       def load_depends_file
-        Depends::Log.info "Loading Dependencies..."
+        say "Loading Dependencies..."
         @def = Depends::DSL::Depend.evaluate('Depends')
         unless @def.unmet_dependencies.empty?
-          Depends::Log.fatal "You have unmet dependencies in your sources, #{@def.unmet_dependencies.inspect}"
+          color "You have unmet dependencies in your sources, #{@def.unmet_dependencies.inspect}", :red
           Process.exit 1
         end
       end
 
 
       def download_extract
-        Depends::Log.info "Downloading and extracting missing dependencies..."
+        say "Downloading and extracting missing dependencies..."
         @def.dependencies.each do |dep|
-          cache_file =  File.join(Depends::Config.cache,File.basename(dep["file"]))
-          cache_directory = File.join(Depends::Config.cache,File.basename(dep["file"],'.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"]
-            Depends::Log.info "Downloading #{dep[:name]}..."
+            say "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
-            Depends::Log.info "Extracting #{cache_file}"
-            Util.un_zip(cache_file,cache_directory) unless config[:dry_run]
+            say "Extracting #{cache_file}"
+            Util.un_zip(cache_file,cache_directory)
           end
 
         end
@@ -79,12 +87,18 @@ module Depends
 
       def link
         @def.dependencies.each do |dep|
-          source = File.join(Depends::Config.cache,File.basename(dep["file"],'.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
-          FileUtils.rm(dep[:destination]) if File.directory? dep[:destination]
-          Depends::Log.info "Linking #{source} to #{dep[:destination]}"
-          FileUtils.symlink(source, dep[:destination])
+          say "Linking #{source} to #{dep[:destination]}"
+
+          if RUBY_PLATFORM =~ /mingw32|mswin32/
+            Dir.delete dep[:destination] if File.exist? dep[:destination]
+            Dir.create_junction(dep[:destination], source)
+          else
+            FileUtils.rm(dep[:destination]) if File.exist? dep[:destination]
+            FileUtils.symlink(source, dep[:destination])
+          end
         end
       end
 

data/lib/depends/commands/list.rb

@@ -0,0 +1,19 @@
+
+module Depends
+  module Commands
+    class List 
+
+      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
+
+      end
+      
+    end
+  end
+end

data/lib/depends/commands/upload.rb

@@ -1,75 +1,51 @@
 module Depends
   module Commands
-    class Upload < Depends::Commands::Base
+    class Upload
 
-      class UploadConfig
-        extend(Mixlib::Config)
-      end
-
-      banner "Upload a dependency to a depends server"
-
-      option :source,
-             :short => "-s source",
-             :long  => "--source source",
-             :description => "Source directory for dependency",
-             :required => true
-
-      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
-             }
-
-      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])
+      def run(options)
+        Depends::Config.load
+        client = Depends::RestClient.new
+        puts "CREATE: #{options.create}"
 
         begin
-          @dep = client.get_depend(config[:name])
+          @dep = client.get_depend(options.dep)
         rescue Nestful::ResourceNotFound => e
-          @dep = client.create_depend(config[:name])
+          if options.create
+            say("Creating dependency")
+            @dep = client.create_depend(options.dep,options.description)
+
+          else
+            color("Dependency does not exist and --create flag was not specified", :red)
+            exit 1
+          end
         end
 
-        file = build_package
+        file = build_package(options)
         sha1 = Digest::SHA1.file(file).to_s
 
-        if @dep['versions'].select { |v| v.eql? config[:version] }.empty?
-          client.create_version(@dep['name'], :file => file, :sha1 => sha1, :version => config[:version])
+        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)
+          end
+        else
+          color("Dependency already exists!", :red)
         end
       end
 
       private
 
-      def build_package
+      def build_package(options)
         upload_dir = File.join(Depends::Config.cache,'upload')
         FileUtils.mkdir_p upload_dir unless File.exist? upload_dir
-        dest_file = File.join(upload_dir, "#{config[:name]}-#{config[:version]}.zip")
+        dest_file = File.join(upload_dir, "#{options.dep}-#{options.num}.zip")
         FileUtils.rm dest_file if File.exist? dest_file
-        source_path = File.expand_path(config[:source])
+        source_path = File.expand_path(options.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/commands/versions.rb

@@ -0,0 +1,19 @@
+
+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

data/lib/depends/config.rb

@@ -2,6 +2,13 @@ module Depends
   class Config
     extend(Mixlib::Config)
 
-    cache File.expand_path('~/.depends_cache')
-  end
-end
+    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)
+    end
+  end 
+end

data/lib/depends/definition.rb

@@ -14,7 +14,6 @@ module Depends
     def map(deps)
       @dependencies = []
       @unmet_dependencies = []
-      Log.debug " :definition => #{@def.inspect}"
       deps.each do |dep|
         dependency_met = false
         sources.each do |source|
@@ -23,11 +22,10 @@ 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         = []
+        @sources         = [Depends::RestClient.new]
         @dependencies    = []
       end
 
@@ -44,7 +44,7 @@ module Depends
 
       private
       def depends_source(source)
-        @sources << Depends::RestClient.new(source)
+        
       end
 
     end

data/lib/depends/rest_client.rb

@@ -1,41 +1,69 @@
 require 'nestful'
+require 'cgi'
+require 'uri'
 module Depends
   class RestClient
 
     attr_accessor :source_url
     attr_reader :cache
 
-    def initialize(source)
-      @source_url = source
-      cache_path = File.join(Depends::Config.cache,'rest',URI.parse(source).hostname )
-      Depends::Log.debug ":cache_path => #{cache_path}"
+    def initialize
+      @source_url = Depends::Config.server
+      cache_path = File.join(Depends::Config.cache,'rest',URI.parse(source_url.to_s).host )
       @cache = ActiveSupport::Cache::FileStore.new(cache_path, :expires_in => 1.day)
     end
 
+    def headers
+      {'key' => Depends::Config.api_key}
+    end
+
     def create_version(name,options = {})
-      Nestful.post "#{source_url}/dependency/#{name}/versions", :format => :multipart, :timeout => 3600, :params => {:version => options[:version] , :file => File.open(options[:file]), :sha1 => options[:sha1] }
+       Nestful.post "#{source_url}/depends/#{name}/version", :headers => headers, :format => :multipart, :timeout => 3600, :params => {:number => options[:number] , :file => File.open(options[:file]), :sha1 => options[:sha1] }
     end
 
-    def create_depend(name)
-      Nestful.post "#{source_url}/dependency",  :format => :json, :params => {:name => name}
+    def create_depend(name,description)
+      depend = Nestful.post "#{source_url}/depends",   :headers => headers, :format => :json, :params => {:name => name, :description => description}
+      depend
     end
 
     def get_depend(name)
-      uri = "#{source_url}/dependency/#{name}"
-      depend = cache.read(uri)
-      if depend.nil?
-        depend = Nestful.get uri, :format => :json
-        cache.write(uri,depend.to_json)
-      else
-        depend = ::MultiJson.load(depend)
-      end
+      uri = "#{source_url}/depends/#{name}"
+      depend = Nestful.get uri, :format => :json,  :headers => headers
       depend
     end
 
     def download_depend_version(name,version)
       dest_file = File.join(Depends::Config.cache, "#{name}-#{version}.zip")
-      file_buffer = Nestful.get "#{source_url}/dependency/#{name}/versions/#{version}/download" , :allow_redirect => true, :buffer => true
-      FileUtils.move file_buffer, dest_file
+
+      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
+      http.request_get("#{uri.path}#{'?' + uri.query if uri.query}") do |response|
+          temp_file = Tempfile.new("download")
+          temp_file.binmode
+
+          size = 0
+          progress = 0
+          total = response.header["Content-Length"].to_i
+
+          response.read_body do |chunk|
+            temp_file << chunk
+            size += chunk.size
+            new_progress = (size * 100) / total
+            unless new_progress == progress
+              say "\rDownloading %s (%3d%%) " % [name, new_progress]
+            end
+            progress = new_progress
+          end
+
+          temp_file.close
+          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
+      
       dest_file
     end
 
@@ -43,28 +71,21 @@ module Depends
       params = {}
 
       if params[:depends_list]
-        Nestful.post "#{source_url}/dependency/search", :params => params, :format => :json
+        Nestful.post "#{source_url}/depends/search", :params => params, :format => :json,  :headers => headers
       else
-        Nestful.get "#{source_url}/dependency", :format => :json
+        Nestful.get "#{source_url}/depends", :format => :json,  :headers => headers
       end
 
     end
 
     def get_latest_version(name)
-      JSON.parse( Nestful.get "#{source_url}/dependency/#{name}/versions/latest" )
+      JSON.parse( Nestful.get "#{source_url}/depends/#{name}/version/latest",  :headers => headers )
     end
 
 
     def get_dep_version(name,version)
-      Depends::Log.debug "[get] :ver => #{version}"
-      uri = "#{source_url}/dependency/#{name}/versions/#{version}"
-      depend = cache.read(uri)
-      if depend.nil?
-        depend = Nestful.get uri, :format => :json
-        cache.write(uri,depend.to_json)
-      else
-        depend = ::MultiJson.load(depend)
-      end
+      uri = "#{source_url}/depends/#{name}/version/#{version}"
+      depend = Nestful.get uri, :format => :json,  :headers => headers
       depend
     end
 

data/lib/depends/util.rb

@@ -5,14 +5,12 @@ module Depends
 
     def self.un_zip(source,destination, options = {})
       options.reverse_merge!({:overwrite => true})
-      Log.debug "Opening #{source}"
+      say "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)

data/lib/depends.rb

@@ -4,12 +4,9 @@ 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'
 
 require 'depends/exceptions'
 require 'depends/config'
@@ -17,10 +14,9 @@ require 'depends/util'
 require 'depends/rest_client'
 require 'depends/dsl/depend'
 require 'depends/definition'
-require 'depends/log/formatter'
-require 'depends/log'
-require 'depends/command_factory'
+require 'terminal-table'
 
-require 'depends/commands/base'
 require 'depends/commands/install'
+require 'depends/commands/list'
+require 'depends/commands/versions'
 require 'depends/commands/upload'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: depends-client
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: 0.2.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Chris Roby
@@ -10,77 +10,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mixlib-log
-  requirement: &70141195519980 !ruby/object:Gem::Requirement
+  name: nestful
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *70141195519980
-- !ruby/object:Gem::Dependency
-  name: nestful
-  requirement: &70141195519180 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141195519180
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
-  requirement: &70141195516600 !ruby/object:Gem::Requirement
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70141195516600
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: &70141195516060 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141195516060
 - !ruby/object:Gem::Dependency
-  name: mixlib-cli
-  requirement: &70141195515520 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70141195515520
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70141195543660 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141195543660
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70141195541840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +70,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70141195541840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70141195539300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +86,60 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70141195539300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.2
+- !ruby/object:Gem::Dependency
+  name: mixlib-config
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - croby@biaprotect.com
@@ -110,16 +150,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/depend
-- lib/depends/command_factory.rb
-- lib/depends/commands/base.rb
+- lib/depends/cli.rb
+- lib/depends/commands/configure.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/util.rb
 - lib/depends.rb
@@ -140,12 +180,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple dependency manager

data/lib/depends/command_factory.rb

@@ -1,31 +0,0 @@
-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

@@ -1,87 +0,0 @@
-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 platform == '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/log/formatter.rb

@@ -1,41 +0,0 @@
-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/log.rb

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