addons-client 0.0.4 → 0.0.5

data/lib/addons-client/cli.rb

@@ -1,3 +1,4 @@
+require 'bigdecimal'
 module Addons::CLI
   extend self
 
@@ -9,6 +10,11 @@ module Addons::CLI
   def run_command!
     command = Settings.rest.first
     case command
+    when /list/i
+      response = client.list(Settings.rest[1..-1].join(" "))
+      response.data.each do |addon_plan|
+        puts "#{addon_plan["name"]} $%0.2f/#{addon_plan["price_unit"]}" % (BigDecimal.new(addon_plan["price_cents"].to_s) / 100)
+      end
     when /deprovision/i
       resource_id = Settings.rest[1]
       raise Addons::UserError, "Must supply resource id" unless resource_id

data/lib/addons-client/client.rb

@@ -8,7 +8,20 @@ module Addons
       @api_url = validate_api_url!
     end
 
+    def self.list(search = nil)
+      wrap_request do
+        if mocked?
+          mocked_list(params)
+        else
+          payload = { :accept => :json }
+          payload[:params] = { :search => search } unless search.nil? || search == ""
+          resource["/addons"].get payload
+        end
+      end
+    end
+
     def self.provision!(slug, opts = {})
+      validate_authenticated_api_url!
       wrap_request do
         addon_name, plan  = slug.split(':')
         raise UserError, "No add-on name given" unless addon_name
@@ -36,22 +49,24 @@ module Addons
             config = config.to_json unless config.is_a? String
             payload.merge! :config => config
           end
-          resource.post payload, :accept => :json
+          resource["/resources"].post payload, :accept => :json
         end
       end
     end
 
     def self.deprovision!(resource_id)
+      validate_authenticated_api_url!
       wrap_request do
         if mocked?
           mocked_deprovision(resource_id)
         else
-          resource["/#{resource_id}"].delete :accept => :json
+          resource["/resources/#{resource_id}"].delete :accept => :json
         end
       end
     end
 
     def self.plan_change!(resource_id, plan)
+      validate_authenticated_api_url!
       wrap_request do
         if mocked?
           mocked_plan_change(resource_id, plan)
@@ -59,7 +74,7 @@ module Addons
           payload = {
             :plan => plan,
           }
-          resource["/#{resource_id}"].put payload, :accept => :json
+          resource["/resources/#{resource_id}"].put payload, :accept => :json
         end
       end
     end
@@ -76,16 +91,19 @@ module Addons
       raise UserError, "Add-on not found: check addon spelling and plan name"
     end
 
+    def self.validate_authenticated_api_url!
+      raise UserError, "No username given" unless api_url.user
+      raise UserError, "No password given" unless api_url.password
+    end
+
     def self.validate_api_url!
       api_url = nil
       raise UserError, "ADDONS_API_URL must be set" unless ENV['ADDONS_API_URL']
       begin
-        api_url = URI.join(ENV['ADDONS_API_URL'], '/api/1/resources')
+        api_url = URI.join(ENV['ADDONS_API_URL'], '/api/1')
       rescue URI::InvalidURIError
         raise UserError, "ADDONS_API_URL is an invalid url"
       end
-      raise UserError, "No username given" unless api_url.user
-      raise UserError, "No password given" unless api_url.password
       api_url
     end
   end

data/lib/addons-client/response.rb

@@ -15,6 +15,10 @@ module Addons
         @data.to_s
       end
 
+      def data
+        @data
+      end
+
       def method_missing(name, *args, &blk)
         if @data.keys.include? name
           @data[name]
@@ -22,7 +26,7 @@ module Addons
           @data[name.to_s]
         else
           super
-        end 
+        end
       end
     end
   end

data/lib/addons-client/version.rb

@@ -1,5 +1,5 @@
 module Addons
   class Client
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/list_test.rb

@@ -0,0 +1,42 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+class ListTest < Addons::Client::TestCase
+  def setup
+    ENV["ADDONS_API_URL"] = 'https://addons.heroku.com'
+    stub_request(:get, %r{#{target_url}}).to_return(:body => [
+      {"id" => "https://addons.heroku.com/addons/cloudcounter:basic","url" => "https://addons.heroku.com/addons/cloudcounter:basic","name" => "cloudcounter:basic","description" => "The basic counter of clouds","beta" => false,"state" => "public","price_cents" => 0,"price_unit" => "month"},
+      {"id" => "https://addons.heroku.com/addons/cloudcounter:pro","url" => "https://addons.heroku.com/addons/cloudcounter:pro","name" => "cloudcounter:pro","description" => "The counter of clouds for professionals","beta" => false,"state" => "public","price_cents" => 1500,"price_unit" => "month"}].
+    to_json)
+    stub(Addons::CLI).puts
+  end
+
+  def target_url
+    URI.join(ENV["ADDONS_API_URL"], '/api/1/addons').to_s
+  end
+
+  def test_cmd_line_lists_addons
+    addons_client! "list"
+    assert_requested(:get, target_url)
+    assert_received(Addons::CLI) do |cli|
+      cli.puts "cloudcounter:basic $0.00/month"
+      #cli.puts "cloudcounter:pro $15.00/month"
+    end
+  end
+
+  def test_cmd_line_passes_arguments
+    addons_client! "list cloud thing"
+    assert_requested(:get, target_url + "?search=cloud+thing")
+  end
+
+  def test_lists_from_ruby
+    Addons::Client.list
+    assert_requested(:get, target_url)
+  end
+
+  def test_passes_args_from_ruby
+    Addons::Client.list "cloud thing"
+    assert_requested(:get, target_url + "?search=cloud+thing")
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addons-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70319713811360 !ruby/object:Gem::Requirement
+  requirement: &70213275701300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319713811360
+  version_requirements: *70213275701300
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &70319713810520 !ruby/object:Gem::Requirement
+  requirement: &70213275696460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319713810520
+  version_requirements: *70213275696460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70319713809040 !ruby/object:Gem::Requirement
+  requirement: &70213275695480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319713809040
+  version_requirements: *70213275695480
 description: Addons Platform API client
 email:
 - csquared@gmail.com
@@ -71,6 +71,7 @@ files:
 - lib/addons-client/version.rb
 - test/client_test.rb
 - test/deprovision_test.rb
+- test/list_test.rb
 - test/plan_change_test.rb
 - test/provision_test.rb
 - test/response_test.rb
@@ -89,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -920029003357087713
+      hash: -1801222150168737241
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -920029003357087713
+      hash: -1801222150168737241
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -108,6 +109,7 @@ summary: Allows platfomrs to provision, deprovision, and change plans for add-on
 test_files:
 - test/client_test.rb
 - test/deprovision_test.rb
+- test/list_test.rb
 - test/plan_change_test.rb
 - test/provision_test.rb
 - test/response_test.rb