kensa 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf02ac33a6d3d6d7df00e355c55cbaed75e09aa
-  data.tar.gz: e5ea9344eb03ccb5384d3b024c9a3cf69a3ca503
+  metadata.gz: 5f100c19fcb05b5c0dd0a94287ac64d745050905
+  data.tar.gz: ac3f713db8e27febba8a41b276de592fa63e469d
 SHA512:
-  metadata.gz: 3250cb8526d605b2b15cad6fc10e67acd161c1432f68e0f234bbfc5c9ab1232c48a809898696ee1471aff328b5b1d7efbff46cdc8e726bcbd5e23b9c669591d3
-  data.tar.gz: db98d6775bd5ed405d879d5d1501961bc4db28e839de7585606052d3422737943a7ddd99c5aa8f83e770ec6481c95505baef70e5f5fd0877bbbe93801c73e76a
+  metadata.gz: c222175a5ce64e55ea5afad73536e716bb38eb66224dd4d84810adcae537dcbb5af2f2b2aea11ee0c7100a3ceeec4c286810962e465149a1bb8673acaede5e1f
+  data.tar.gz: d9cd6cffdd76e56bf78b9d7c1ad8b21abca12729fa59c0deedd4985d29ec9355f8fe8736002d6357d314c6a1216d60ee5a079de494c19d70953acbb9f8a59e16

data/.travis.yml

@@ -1,11 +1,16 @@
-branches:
-  only:
-    - master
+language: ruby
+
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
+
+sudo: false
+
+branches:
+  only:
+    - master
+
 notifications:
   email:
     - addons@heroku.com

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    kensa (2.1.0)
+    kensa (2.2.0)
       launchy (~> 2.2.0)
       mechanize (~> 2.6.0)
+      netrc (~> 0.10.3)
       rest-client (~> 1.4, < 1.7.0)
       term-ansicolor (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.8)
     artifice (0.6)
       rack-test
     coderay (1.0.8)
     contest (0.1.3)
-    domain_name (0.5.16)
+    domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
     fakefs (0.4.2)
     launchy (2.2.0)
@@ -30,11 +31,12 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.1)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.6.2)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    netrc (0.10.3)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
     pry (0.9.11.4)
       coderay (~> 1.0.5)
@@ -46,8 +48,10 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rdoc (4.2.0)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     rr (1.0.4)
     sinatra (1.4.2)
       rack (~> 1.5, >= 1.5.2)
@@ -58,8 +62,8 @@ GEM
       tins (~> 1.0)
     tilt (1.3.6)
     timecop (0.6.1)
-    tins (1.0.0)
-    unf (0.1.3)
+    tins (1.3.5)
+    unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
     webrobots (0.1.1)

data/bin/kensa

@@ -68,7 +68,7 @@ COMMANDS
 
 TEST TYPES
 
-  provision [optional params] 
+  provision [optional params]
     Simulate a provision call from Heroku.
     [optional params]
       accepts extra command options and passes them on to the provision request
@@ -87,6 +87,6 @@ TEST TYPES
     Confirm that the manifest is valid.  Automatically runs before all tests.
 
   all
-    runs provision, planchange, and deprovision tests.  
+    runs provision, planchange, and deprovision tests.
     defaults to using 'foo' for planchange plan.
 

data/kensa.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<launchy>, "~> 2.2.0")
   s.add_runtime_dependency(%q<mechanize>, "~> 2.6.0")
+  s.add_runtime_dependency(%q<netrc>, "~> 0.10.3")
   s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", "~> 1.4"])
   s.add_runtime_dependency(%q<term-ansicolor>, "~> 1.3")
 

data/lib/heroku/kensa/check.rb

@@ -127,7 +127,7 @@ module Heroku
           end
         end
 
-        if data["api"].has_key?("config_vars") 
+        if data["api"].has_key?("config_vars")
           check "contains config_vars array" do
             data["api"]["config_vars"].is_a?(Array)
           end
@@ -189,7 +189,7 @@ module Heroku
           end
 
           check "all keys in the manifest are present" do
-            difference = data['api']['config_vars'] - response['config'].keys 
+            difference = data['api']['config_vars'] - response['config'].keys
             unless difference.empty?
               verb = (difference.size == 1) ? "is" : "are"
               print "\n\t", yellow( "#{difference.join(', ')} #{verb} missing from the manifest")
@@ -280,7 +280,7 @@ module Heroku
         payload = {
           :heroku_id => heroku_id,
           :plan => data[:plan] || 'test',
-          :callback_url => callback, 
+          :callback_url => callback,
           :logplex_token => nil,
           :region => "amazon-web-services::us-east-1",
           :options => data[:options] || {}
@@ -456,7 +456,7 @@ module Heroku
 
         check "validates token" do
           @sso.token = 'invalid'
-          page, respcode = mechanize_get 
+          page, respcode = mechanize_get
           error("expected 403, got #{respcode}") unless respcode == 403
           true
         end
@@ -470,7 +470,7 @@ module Heroku
 
         page_logged_in = nil
         check "logs in" do
-          page_logged_in, respcode = mechanize_get 
+          page_logged_in, respcode = mechanize_get
           error("expected 200, got #{respcode}") unless respcode == 200
           true
         end

data/lib/heroku/kensa/client.rb

@@ -2,6 +2,7 @@ require 'restclient'
 require 'term/ansicolor'
 require 'launchy'
 require 'optparse'
+require 'netrc'
 
 module Heroku
   module Kensa
@@ -25,7 +26,7 @@ module Heroku
         manifest = Manifest.new(@options)
         protect_current_manifest!
         manifest.write
-        screen.message "Initialized new addon manifest in #{filename}\n" 
+        screen.message "Initialized new addon manifest in #{filename}\n"
         if @options[:foreman]
           screen.message "Initialized new .env file for foreman\n"
         end
@@ -42,7 +43,7 @@ module Heroku
           @options[:foreman] = true
           init
         rescue Exception => e
-          raise CommandInvalid.new("error cloning #{Git.clone_url(template)} into #{app_name}") 
+          raise CommandInvalid.new("error cloning #{Git.clone_url(template)} into #{app_name}")
         end
       end
 
@@ -124,7 +125,7 @@ module Heroku
             puts
           end
         end
-        
+
         def filename
           @options[:filename]
         end
@@ -185,6 +186,14 @@ module Heroku
         end
 
         def ask_for_credentials
+          netrc_creds = Netrc.read['api.heroku.com']
+          if netrc_creds
+            print "Found credentials for #{netrc_creds.login}, proceed? (y/N) "
+            if gets.chomp.downcase == "y"
+              return [ netrc_creds.login, netrc_creds.password]
+            end
+          end
+
           puts "Enter your Heroku Provider credentials."
 
           print "Email: "
@@ -273,7 +282,7 @@ module Heroku
         # OptionParser errors out on unnamed options so we have to pull out all the --flags and --flag=somethings
         KNOWN_ARGS = %w{file async production without-sso help plan version sso foreman template}
         def self.pre_parse(args)
-          args.partition do |token| 
+          args.partition do |token|
             token.match(/^--/) && !token.match(/^--(#{KNOWN_ARGS.join('|')})/)
           end.reverse
         end
@@ -287,7 +296,7 @@ module Heroku
                 value = peek && !peek.match(/^--/) ? peek : 'true'
               end
               key = key.sub(/^--/,'')
-              options[key] = value 
+              options[key] = value
             end
           end
         end
@@ -317,11 +326,11 @@ module Heroku
             end
           end
         end
-        
+
         def self.parse(args)
           if args[0] == 'test' && args[1] == 'provision'
             safe_args, extra_params = self.pre_parse(args)
-            self.defaults.tap do |options| 
+            self.defaults.tap do |options|
               options.merge! self.parse_command_line(safe_args)
               options.merge! :options => self.parse_provision(extra_params, args)
             end
@@ -329,7 +338,7 @@ module Heroku
             self.defaults.merge(self.parse_command_line(args))
           end
         end
-      end 
+      end
     end
   end
 end

data/lib/heroku/kensa/git.rb

@@ -27,7 +27,7 @@ module Heroku
         def clone_url(name)
           if name.include? "://" #its a full url not on github
             return name
-          elsif !name.include? "/" #its one of ours 
+          elsif !name.include? "/" #its one of ours
             name = heroku_prefix + name
           end
 

data/lib/heroku/kensa/http.rb

@@ -29,7 +29,7 @@ module Heroku
           args = [
             { :accept => "application/json" }
           ]
-          
+
           if payload
             args.first[:content_type] = "application/json"
             args.unshift OkJson.encode(payload)

data/lib/heroku/kensa/okjson-support.rb

@@ -4,9 +4,9 @@ class Hash
     each do |key, value|
       case value
       when Hash
-        value = value.stringify_keys 
+        value = value.stringify_keys
       when Array
-        value = value.map { |v| v.stringify_keys if v.is_a? Hash } 
+        value = value.map { |v| v.stringify_keys if v.is_a? Hash }
       end
 
       new_hash[key.to_s] = value
@@ -20,5 +20,5 @@ module OkJson
 
   def encode(x)
     encode_without_stringify(x.stringify_keys)
-  end  
+  end
 end

data/lib/heroku/kensa/post_proxy.rb

@@ -21,7 +21,7 @@ class Heroku::Kensa::PostProxy < WEBrick::HTTPServer
           <form action="#{@sso.post_url}" method="POST">
             #{ @params.map do |key, value|
                 %|<input type="hidden" name="#{key}" value="#{value}" />|
-               end.join("\n")  
+               end.join("\n")
              }
           </form>
         </body>

data/lib/heroku/kensa/sso.rb

@@ -16,13 +16,13 @@ module Heroku
           @proxy_port = find_available_port
         else
           @url  = data["api"][env].chomp('/')
-        end 
+        end
         @timestamp  = Time.now.to_i
         @token      = make_token(@timestamp)
       end
 
       def path
-        if self.POST? 
+        if self.POST?
           URI.parse(url).path
         else
           "/heroku/resources/#{id}"
@@ -53,7 +53,7 @@ module Heroku
       def timestamp=(other)
         @timestamp = other
         @token = make_token(@timestamp)
-      end 
+      end
 
       def make_token(t)
         Digest::SHA1.hexdigest([@id, @salt, t].join(':'))
@@ -61,7 +61,7 @@ module Heroku
 
       def querystring
         return '' unless @salt
-        '?' + query_data 
+        '?' + query_data
       end
 
       def query_data
@@ -69,7 +69,7 @@ module Heroku
       end
 
       def query_params
-        { 'token'     => @token,  
+        { 'token'     => @token,
           'timestamp' => @timestamp.to_s,
           'nav-data'  => sample_nav_data,
           'email'     => 'username@example.com',
@@ -124,7 +124,7 @@ module Heroku
 
         trap("INT") { server.stop }
         pid = fork do
-          server.start 
+          server.start
         end
         at_exit { server.stop; Process.waitpid pid }
       end

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

data/test/resources/server.rb

@@ -35,7 +35,7 @@ helpers do
       raise "#{param} not included with request" unless params.keys.include? param
     end
   end
-  
+
   def login(heroku_user=true)
   @header = heroku_user
   erb <<-ERB

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -13,180 +13,194 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.7.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: artifice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: contest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Kensa is a command-line tool to help add-on providers integrating their
@@ -198,8 +212,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -244,17 +258,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tool to help Heroku add-on providers integrating their services