depends-client 0.2.0.beta2 → 0.2.0.beta3

data/README.md

@@ -18,19 +18,18 @@ gem install depends-client
 2. Setup ~/.depends/config.rb
 
 ```ruby
-api_key '<YOUR KEY HERE>'
-server 'https://depends.aws.af.cm'
+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.
 
     ```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'
+    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'
 
     ```
 
@@ -45,7 +44,7 @@ depend
 
 _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
+You're done! Packages are downloaded, extracted and installed per the instructions in your gem file.
 
 
 The Future

data/lib/depends/commands/install.rb

@@ -49,12 +49,12 @@ module Depends
               ignore.delete(line.chomp)
             end
           end
-          File.open(file, 'a') { |f|
+          File.open(file, 'a') do |f|
             ignore.each do |i|
               f.puts ""
               f.puts i
             end
-          }
+          end
         end
       end
 
@@ -76,7 +76,7 @@ module Depends
       def download_extract
         say "Downloading and extracting missing dependencies..."
         @def.dependencies.each do |dep|
-          file_name = "#{dep[:name]}-#{dep['number']}.zip"
+          file_name = "#{Util.depend_name_with_version(dep)}.zip"
           cache_file =  File.join(Depends::Config.cache,file_name)
           cache_directory = File.join(Depends::Config.cache,File.basename(file_name,'.zip'))
 
@@ -96,7 +96,7 @@ module Depends
 
       def link
         @def.dependencies.each do |dep|
-          source = File.join(Depends::Config.cache,File.basename("#{dep[:name]}-#{dep['number']}",'.zip'))
+          source = File.join(Depends::Config.cache,File.basename(Util.depend_name_with_version(dep),'.zip'))
           base_dir = File.dirname(dep[:destination])
           FileUtils.mkdir_p(base_dir) unless File.exist? base_dir
           say "Linking #{source} to #{dep[:destination]}"

data/lib/depends/commands/upload.rb

@@ -42,9 +42,9 @@ module Depends
 
       def build_package(options)
         upload_dir = File.join(Depends::Config.cache,'upload')
-        FileUtils.mkdir_p upload_dir unless File.exist? upload_dir
+        FileUtils.mkdir_p upload_dir
         dest_file = File.join(upload_dir, "#{options.dep}-#{options.num}.zip")
-        FileUtils.rm dest_file if File.exist? dest_file
+        FileUtils.rm_f
         source_path = File.expand_path(options.source)
         Zip::ZipFile.open(dest_file, Zip::ZipFile::CREATE) { |zipfile|
           Dir["#{source_path}/**/*"].each do |file|

data/lib/depends/rest_client.rb

@@ -34,9 +34,7 @@ module Depends
 
     def download_depend_version(name,version)
       dest_file = File.join(Depends::Config.cache, "#{name}-#{version}.zip")
-
-      request = Nestful.get "#{source_url}/depends/#{name}/version/#{version}/download.url",  :headers => headers
-      uri = URI.parse(request)
+      uri = get_downlad_uri(name,version)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -59,7 +57,7 @@ module Depends
           end
 
           temp_file.close
-          File.unlink dest_file if File.exists?(dest_file)
+          FileUtils.rm_f dest_file
           FileUtils.mkdir_p File.dirname(dest_file)
           FileUtils.mv temp_file.path, dest_file, :force => true
       end
@@ -89,6 +87,11 @@ module Depends
       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

@@ -30,5 +30,9 @@ module Depends
           source
       end
     end
+
+    def self.depend_name_with_version(dep)
+      "#{dep[:name]}-#{dep['number']}"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depends-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
+  version: 0.2.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nestful