flipp 0.0.2.10 → 0.0.2.11

data/Rakefile

@@ -1,2 +1,2 @@
 $:.unshift File.expand_path('..', __FILE__)
-require 'lib/flipp/tasks'
+# require 'lib/flipp/tasks'

data/flipp.gemspec

@@ -5,7 +5,7 @@ require 'bundler'
 
 Gem::Specification.new do |s|
   s.name        = "flipp"
-  s.version     = '0.0.2.10'
+  s.version     = '0.0.2.11'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mike Pack"]
   s.email       = ["mikepackdev@gmail.com"]

data/lib/flipp/flipp.rb

@@ -18,8 +18,9 @@ module Flipp
 
       # Try connecting to the new database
       begin
-        ActiveRecord::Base.establish_connection new_config
-      rescue Mysql2::Error => exception
+        connection = ActiveRecord::Base.establish_connection new_config
+        connection.checkout
+      rescue
         create_new_db_or_fallback current_config, new_config
       end
     end

data/lib/flipp/helpers/git_helper.rb

@@ -3,32 +3,6 @@ require 'fileutils'
 module Flipp
   module Helpers
     module GitHelper
-      def self.hook_installed?
-        File.exists? File.join(Rails.root, '.git/hooks/post-checkout')
-      end
-
-      def self.install_hook
-        # Check for the .git directory
-        if File.directory? '.git'
-          unless File.directory? '.git/hooks'
-            # Create hooks directory
-          end
-
-          # Copy the file to the git hooks
-          puts 'Moving git hook into place...'
-          FileUtils.cp File.join(File.dirname(__FILE__), '..', 'git_hooks', 'post-checkout'), File.join(Rails.root, '.git/hooks/post-checkout')
-          # And give it execute permissions
-          FileUtils.chmod 0755, '.git/hooks/post-checkout'
-        else
-          puts "Can't find your .git directory. Are you at the root of your project?"
-        end
-      end
-
-      def self.uninstall_hook
-        puts 'Removing git hook...'
-        FileUtils.rm File.join(Rails.root, '.git/hooks/post-checkout')
-      end
-
       def self.current_branch
         `git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* /\1/'`.chomp[1..-1] # Remove control character
       end

data/lib/flipp/railtie.rb

@@ -9,9 +9,5 @@ module Flipp
         flipp.switch_databases
       end
     end
-
-    rake_tasks do
-      load 'flipp/tasks.rb'
-    end
   end
 end

data/spec/lib/flipp/flipp_spec.rb

@@ -12,7 +12,7 @@ describe Flipp::Flipp do
     end
 
     it 'tries to connect to the new database' do
-      ActiveRecord::Base.should_receive(:establish_connection).with(an_instance_of(Hash))
+      ActiveRecord::Base.should_receive(:establish_connection).with(an_instance_of(Hash)).any_number_of_times
       flipp.switch_databases
     end
 

data/spec/lib/flipp/helpers/git_helper_spec.rb

@@ -6,34 +6,6 @@ describe Flipp::Helpers::GitHelper do
     Rails.stub(:root).and_return(File.join(File.dirname(__FILE__), '..', '..', '..', '..'))
   end
 
-  describe '#hook_installed?' do
-    it 'returns true when the hook exists' do
-      FileUtils.touch '.git/hooks/post-checkout'
-      Flipp::Helpers::GitHelper.hook_installed?.should be_true
-    end
-
-    it 'returns false when the hook does not exists' do
-      FileUtils.rm '.git/hooks/post-checkout'
-      Flipp::Helpers::GitHelper.hook_installed?.should be_false
-    end
-  end
-
-  describe '#install_hook' do
-    it 'moves the git hook into place' do
-      Flipp::Helpers::GitHelper.install_hook
-      FileUtils.compare_file('.git/hooks/post-checkout', File.expand_path('../../../../../lib/flipp/git_hooks/post-checkout', __FILE__))
-    end
-  end
-
-  describe '#uninstall_hook' do
-    before { Flipp::Helpers::GitHelper.install_hook }
-
-    it 'remove the git hook' do
-      Flipp::Helpers::GitHelper.uninstall_hook
-      Flipp::Helpers::GitHelper.hook_installed?.should be_false
-    end
-  end
-
   describe '#current_branch' do
     it 'returns the name of the current git branch' do
       `git checkout -b new_and_fun_branch`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipp
 version: !ruby/object:Gem::Version
-  version: 0.0.2.10
+  version: 0.0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70140922642740 !ruby/object:Gem::Requirement
+  requirement: &70199856728960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140922642740
+  version_requirements: *70199856728960
 - !ruby/object:Gem::Dependency
   name: database_exporter
-  requirement: &70140922641700 !ruby/object:Gem::Requirement
+  requirement: &70199856727940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140922641700
+  version_requirements: *70199856727940
 description: To alleviate issues around highly divergent development databases on
   feature/refactor branches, flipp helps switch databases upon new branch checkouts.
 email:
@@ -47,9 +47,7 @@ files:
 - lib/flipp/flipp.rb
 - lib/flipp/helpers/git_helper.rb
 - lib/flipp/railtie.rb
-- lib/flipp/tasks.rb
 - lib/flipp.rb
-- lib/flipp/git_hooks/post-checkout
 - spec/lib/flipp/flipp_spec.rb
 - spec/lib/flipp/helpers/git_helper_spec.rb
 - spec/spec_helper.rb

data/lib/flipp/git_hooks/post-checkout

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname(__FILE__), '../../lib/flipp')
-# require 'flipp'
-
-if ARGV[2] == '1' # This was a branch switch
-  flipp = Flipp.new
-  flipp.switch_databases
-end

data/lib/flipp/tasks.rb

@@ -1,15 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'lib/flipp/helpers/git_helper')
-
-namespace :flipp do
-  desc 'Install flipp'
-  task :install do
-    # Move git hook into place
-    Flipp::Helpers::GitHelper.install_hook
-  end
-
-  desc 'Uninstall flipp'
-  task :uninstall do
-    # Remove git hook
-    Flipp::Helpers::GitHelper.uninstall_hook
-  end
-end