cap-taffy 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.3 / 2010-01-26
+* 1 major fix
+  * Fixed for Heroku 1.6.3
+
 == 0.0.2 / 2009-09-14
 * 1 minor enhancement
   * Added authorizing SSH public keys on remote server(s).

data/Rakefile

@@ -32,3 +32,4 @@ PROJ.summary = "Capistrano recipes for deploying databases (managing database.ym
 PROJ.ignore_file = '.gitignore'
 PROJ.spec.opts << '--color'
 PROJ.exclude << "bin"
+PROJ.rcov.opts << IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten

data/lib/cap-taffy.rb

@@ -1,8 +1,7 @@
-
 module CapTaffy
 
   # :stopdoc:
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -12,34 +11,4 @@ module CapTaffy
   def self.version
     VERSION
   end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
 end

data/lib/cap-taffy/parse.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
 begin
   require 'heroku'
+  require 'heroku/command'
   require 'heroku/commands/base'
   require 'heroku/commands/db'
 rescue LoadError
-  error "Install the Heroku gem. On most systems this will be:\nsudo gem install taps"
+  error "Install the Heroku gem. On most systems this will be:\nsudo gem install heroku"
 end
 
 module CapTaffy

data/spec/cap-taffy/db_spec.rb

@@ -32,6 +32,25 @@ module CapTaffy
         @namespace.instance_variable_get(:@local_database_url).should == "local_db_url"
       end
 
+      for_task :detect, :roles => :app, :in => :Db, :it => "should be safe if dry run" do
+        @mod.expects(:remote_database_url).raises Exception
+        @mod.expects(:local_database_url).raises Exception
+        @namespace.stubs(:dry_run).returns(true)
+
+        load 'lib/cap-taffy/db.rb'
+
+        @namespace.instance_variable_get(:@remote_database_url).should == ""
+        @namespace.instance_variable_get(:@local_database_url).should == ""
+      end
+
+      for_task :detect, :roles => :app, :in => :Db, :it => "should raise as usual if not dry run" do
+        class SpecialError < StandardError; end
+        @mod.expects(:remote_database_url).raises SpecialError
+        @namespace.stubs(:dry_run).returns(false)
+
+        lambda { load 'lib/cap-taffy/db.rb' }.should raise_error(SpecialError)
+      end
+
       def load_taffy_db # :nodoc:
         with_logger do
           load 'lib/cap-taffy/db.rb'
@@ -83,7 +102,7 @@ module CapTaffy
       end
     end
 
-    context "after capistrano" do
+    context "after capistrano loaded" do
       include CapistranoHelpers
       include TaffyHelpers
 

data/spec/cap-taffy_spec.rb

@@ -1,4 +1,7 @@
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 
 describe CapTaffy do
+  it "should get the version" do
+    CapTaffy::VERSION.should == CapTaffy.version
+  end
 end

data/spec/rcov.opts

@@ -0,0 +1 @@
+--exclude "spec/*,gems/*"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cap-taffy
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Henry Hsu
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2010-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - spec/cap-taffy/parse_spec.rb
 - spec/cap-taffy/ssh_spec.rb
 - spec/cap-taffy_spec.rb
+- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/ann.rake