kensa 1.1.0.pre → 1.1.0.pre2

data/bin/kensa

@@ -26,7 +26,9 @@ end
 include Heroku::Kensa
 
 begin
-  Client.new(ARGV, options).run!
+  args = ARGV.dup
+  ARGV.clear
+  Client.new(args, options).run!
 rescue Client::CommandInvalid
   abort File.read(__FILE__).split('__END__').last
 end
@@ -66,6 +68,8 @@ COMMANDS
 
   push            Send the manifest to Heroku
 
+  pull <id>       Fetch the latest manifest from Heroku
+
 TEST TYPES
 
   provision

data/kensa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.1.0.pre"
+  s.version = "1.1.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]

data/lib/heroku/kensa.rb

@@ -5,6 +5,6 @@ require 'heroku/kensa/sso'
 
 module Heroku
   module Kensa
-    VERSION = "1.1.0.pre"
+    VERSION = "1.1.0.pre2"
   end
 end

data/lib/heroku/kensa/client.rb

@@ -71,7 +71,6 @@ module Heroku
         user, password = ask_for_credentials
         host     = ENV['ADDONS_HOST'] || 'https://addons.heroku.com'
         data     = Yajl::Parser.parse(resolve_manifest)
-        headers  = { "X-Kensa-Version" => "1", "User-Agent" => "kensa/#{VERSION}" }
         resource = RestClient::Resource.new(host, user, password)
         resource['provider/addons'].post(resolve_manifest, headers)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
@@ -84,20 +83,44 @@ module Heroku
         abort("Not authorized to push this manifest. Please make sure you have permissions to push it")
       end
 
+      def pull
+        addon = @args.first || abort('usage: kensa pull <add-on name>')
+
+        if manifest_exists?
+          print "Manifest already exists. Replace it? (y/n) "
+          abort unless gets.strip.downcase == 'y'
+          puts
+        end
+
+        user, password = ask_for_credentials
+        host     = ENV['ADDONS_HOST'] || 'https://addons.heroku.com'
+        resource = RestClient::Resource.new(host, user, password)
+        manifest = resource["provider/addons/#{addon}"].get(headers)
+        File.open(filename, 'w') { |f| f.puts manifest }
+        puts "-----> Manifest for \"#{addon}\" received successfully"
+      end
+
       def version
         puts "Kensa #{VERSION}"
       end
 
       private
+        def headers
+          { :accept => :json, "X-Kensa-Version" => "1", "User-Agent" => "kensa/#{VERSION}" }
+        end
 
         def resolve_manifest
-          if File.exists?(filename)
+          if manifest_exists?
             File.read(filename)
           else
             abort("fatal: #{filename} not found")
           end
         end
 
+        def manifest_exists?
+          File.exists?(filename)
+        end
+
         def run_check(klass, args={})
           screen = Screen.new
           data = Yajl::Parser.parse(resolve_manifest)

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 1
   - 0
-  - pre
-  version: 1.1.0.pre
+  - pre2
+  version: 1.1.0.pre2
 platform: ruby
 authors: 
 - Blake Mizerany