kensa 1.2.1 → 1.3.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    kensa (1.2.1)
+    kensa (1.3.0)
       launchy (>= 0.3.2)
       mechanize (~> 1.0.0)
-      rest-client (< 1.7.0, >= 1.4.0)
+      rest-client (>= 1.4.0, < 1.7.0)
       term-ansicolor (~> 1.0)
 
 GEM

data/bin/kensa

@@ -86,3 +86,7 @@ TEST TYPES
   manifest
     Confirm that the manifest is valid.  Automatically runs before all tests.
 
+  all
+    runs provision, planchange, and deprovision tests.  
+    defaults to using 'foo' for planchange plan.
+

data/lib/heroku/kensa/check.rb

@@ -488,6 +488,8 @@ module Heroku
           screen.message "End of #{args.first}\n"
         end
 
+        data[:plan] ||= 'foo'
+        run PlanChangeCheck, data
         run DeprovisionCheck, data
       end
 

data/lib/heroku/kensa/client.rb

@@ -22,7 +22,9 @@ module Heroku
       end
 
       def init
-        Manifest.new(@options).write
+        manifest = Manifest.new(@options)
+        protect_current_manifest!
+        manifest.write
         screen.message "Initialized new addon manifest in #{filename}\n" 
         if @options[:foreman]
           screen.message "Initialized new .env file for foreman\n"
@@ -60,6 +62,8 @@ module Heroku
           when "sso"
             id = @args.shift || abort("! no id specified; see usage")
             run_check ManifestCheck, SsoCheck, :id => id
+          when "all"
+            run_check AllCheck
           else
             abort "! Unknown test '#{check}'; see usage"
         end
@@ -97,12 +101,7 @@ module Heroku
 
       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
+        protect_current_manifest!
 
         user, password = ask_for_credentials
         host     = heroku_host
@@ -117,6 +116,14 @@ module Heroku
       end
 
       private
+        def protect_current_manifest!
+          if manifest_exists?
+            print "Manifest already exists. Replace it? (y/n) "
+            abort unless gets.strip.downcase == 'y'
+            puts
+          end
+        end
+        
         def filename
           @options[:filename]
         end

data/lib/heroku/kensa/manifest.rb

@@ -4,7 +4,7 @@ module Heroku
 
       def initialize(options = {})
         @method   = options.fetch(:method, 'get').to_sym
-        @filename = options.fetch(:filename, 'addon-manifest.json')
+        @filename = options[:filename]
         @options  = options
       end
 

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/test/all_check_test.rb

@@ -3,6 +3,7 @@ require 'test/helper'
 class AllCheckTest < Test::Unit::TestCase
   include Heroku::Kensa
   include ProviderMock
+  include FsMock
 
   setup do
     @data = Manifest.new(:method => :get).skeleton
@@ -23,4 +24,10 @@ class AllCheckTest < Test::Unit::TestCase
     assert_invalid
   end
 
+  test "all runs" do
+    assert_nothing_raised do
+      kensa "init"
+      kensa "test all"
+    end
+  end
 end

data/test/helper.rb

@@ -5,6 +5,7 @@ require 'timecop'
 require 'rr'
 require 'artifice'
 require 'test/resources/server'
+require 'fakefs/safe'
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
@@ -12,10 +13,26 @@ class Test::Unit::TestCase
   module ProviderMock
     def setup
       Artifice.activate_with(ProviderServer)
+      super
     end
 
     def teardown
       Artifice.deactivate
+      super
+    end
+  end
+
+  module FsMock
+    def setup
+      FakeFS.activate!
+      @filename = 'addon-manifest.json'
+      super
+    end
+
+    def teardown
+      File.unlink(@filename) if @filename && File.exist?(@filename)
+      FakeFS.deactivate!
+      super
     end
   end
 

data/test/init_test.rb

@@ -1,15 +1,19 @@
 require 'test/helper'
-require 'fakefs/safe'
 
 class InitTest < Test::Unit::TestCase
-  def setup
-    FakeFS.activate!
-    @filename = 'addon-manifest.json'
-  end
+  include FsMock
+
+  def test_init_doesnt_overwite_addon_manifest
+    File.open(@filename, 'w') { |f| f << '{}' }
+    any_instance_of(Heroku::Kensa::Client) do |client|
+      stub(client).gets { 'n' }
+      stub(client).print
+      stub(client).puts
+    end
 
-  def teardown
-    File.unlink(@filename) if @filename && File.exist?(@filename)
-    FakeFS.deactivate!
+    assert_raises SystemExit do
+      kensa "init"
+    end
   end
   
   def test_init_default_so_sso_post

data/test/options_parsing_test.rb

@@ -2,6 +2,7 @@ require 'test/helper'
 
 class OptionParsingTest < Test::Unit::TestCase 
   include Heroku::Kensa
+  include FsMock
 
   def options_for_cmd(string)
     client = Client.new(string.split)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
+date: 2011-12-21 00:00:00 -08:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency