vendor 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    vendor (0.0.2)
+    vendor (0.0.3)
+      highline
       json
       rake
       rest-client
@@ -17,13 +18,14 @@ GEM
     columnize (0.3.4)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
+    highline (1.6.2)
     json (1.6.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mime-types (1.16)
-    rake (0.9.2)
+    mime-types (1.17.2)
+    rake (0.9.2.2)
     rbx-require-relative (0.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/Readme.markdown

@@ -122,7 +122,7 @@ Now that you have a packaged library, you can push it to [http://vendorforge.org
 running:
 
 ```bash
-$ vendor library publish my_library.vendor
+$ vendor library push my_library.vendor
 ```
 
 ## What about CocoaPods?

data/lib/vendor/api.rb

@@ -3,10 +3,16 @@ require 'rest_client'
 module Vendor
   module API
 
+    require 'json'
+
     extend self
 
     class Error < StandardError; end
 
+    def api_uri
+      ENV["API_URI"] || 'http://vendorforge.org'
+    end
+
     def api_key(username, password)
       perform do
         response = resource(username, password)["users/#{username}/api_key.json"].get
@@ -14,7 +20,7 @@ module Vendor
       end
     end
 
-    def publish(options)
+    def push(options)
       perform do
         response = resource["vendors.json"].post :version => { :package => File.new(options[:file]) }, :api_key => options[:api_key]
         body = JSON.parse(response.body)
@@ -42,7 +48,7 @@ module Vendor
       end
 
       def resource(user = nil, pass = nil)
-        RestClient::Resource.new(ENV["API_URI"] || 'http://vendorforge.org', :user => user, :password => pass)
+        RestClient::Resource.new(api_uri, :user => user, :password => pass)
       end
 
   end

data/lib/vendor/cli/app.rb

@@ -6,7 +6,7 @@ module Vendor
 
       class Library < Thor
 
-        desc "init", "Generate a simple vendorspec, placed in the current directory"
+        desc "library init", "Generate a simple vendorspec, placed in the current directory"
         def init
           # Use the current folder name as the name of the vendorspec
           name = File.basename(Dir.pwd)
@@ -35,12 +35,12 @@ module Vendor
           end
         end
 
-        desc "library publish VENDOR_FILE", "Publish a vendor package to vendorforge.org"
-        def publish(file)
+        desc "library push VENDOR_FILE", "Push a vendor package to vendorforge.org"
+        def push(file)
           begin
             Vendor::CLI::Auth.with_api_key do |api_key|
-              url = Vendor::API.publish :file => File.expand_path(file), :api_key => api_key
-              Vendor.ui.success "Successfully published to #{url}"
+              url = Vendor::API.push :file => File.expand_path(file), :api_key => api_key
+              Vendor.ui.success "Successfully pushed to #{Vendor::API.api_uri}#{url}"
             end
           rescue Vendor::API::Error => e
             Vendor.ui.error "Error: #{e.message}"

data/lib/vendor/cli/auth.rb

@@ -4,6 +4,8 @@ module Vendor
 
     module Auth
 
+      require 'highline/import'
+
       extend self
 
       def api_key
@@ -16,10 +18,9 @@ module Vendor
 
       def fetch_api_key
         Vendor.ui.warn "Please enter your vendorforge.org login and password"
-        printf "Login: "
-        username = STDIN.gets.chomp.strip
-        printf "Password: "
-        password = STDIN.gets.chomp.strip
+
+        username = ask("Login: ")
+        password = ask("Password: ") { |q| q.echo = false }
 
         Vendor::Config.set(:"credentials.vendorforge_api_key", Vendor::API.api_key(username, password))
       end

data/lib/vendor/version.rb

@@ -1,5 +1,5 @@
 module Vendor
 
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
 end

data/spec/lib/vendor/cli/auth_spec.rb

@@ -41,10 +41,9 @@ describe Vendor::CLI::Auth do
   context "#fetch_api_key" do
 
     it "should ask for their username and password" do
-      STDIN.should_receive(:gets).once.ordered.and_return "keithpitt"
-      STDIN.should_receive(:gets).once.ordered.and_return "password"
+      Vendor::CLI::Auth.should_receive(:ask).once.ordered.and_return "keithpitt"
+      Vendor::CLI::Auth.should_receive(:ask).once.ordered.and_return "password"
       Vendor.ui.should_receive(:warn).once
-      Vendor::CLI::Auth.should_receive(:printf).twice
 
       Vendor::CLI::Auth.fetch_api_key.should == "secret"
     end

data/vendor.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "rubyzip"
   s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "highline"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306350501080 !ruby/object:Gem::Requirement
+  requirement: &70325740905740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306350501080
+  version_requirements: *70325740905740
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70306350500220 !ruby/object:Gem::Requirement
+  requirement: &70325740905100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306350500220
+  version_requirements: *70325740905100
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &70306350498880 !ruby/object:Gem::Requirement
+  requirement: &70325740904480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350498880
+  version_requirements: *70325740904480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70306350496500 !ruby/object:Gem::Requirement
+  requirement: &70325740904040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350496500
+  version_requirements: *70325740904040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70306350495200 !ruby/object:Gem::Requirement
+  requirement: &70325740903620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350495200
+  version_requirements: *70325740903620
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70306350494060 !ruby/object:Gem::Requirement
+  requirement: &70325740903020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350494060
+  version_requirements: *70325740903020
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70306350491180 !ruby/object:Gem::Requirement
+  requirement: &70325740902400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350491180
+  version_requirements: *70325740902400
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70306350490260 !ruby/object:Gem::Requirement
+  requirement: &70325740901760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306350490260
+  version_requirements: *70325740901760
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70325740901340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70325740901340
 description: Vendor manages an application's dependencies
 email:
 - me@keithpitt.com