flipp 0.0.1.1 → 0.0.2

data/Rakefile

@@ -1,2 +1,2 @@
 $:.unshift File.expand_path('..', __FILE__)
-require 'tasks/flipp'
+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.1.1'
+  s.version     = '0.0.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mike Pack"]
   s.email       = ["mikepackdev@gmail.com"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord'
   s.add_runtime_dependency 'database_exporter'
 
-  s.files = %w( README.md Rakefile flipp.gemspec tasks/flipp.rb ) + Dir["lib/**/*.rb"]
+  s.files = %w( README.md Rakefile flipp.gemspec ) + Dir["lib/**/*.rb"]
   s.test_files = Dir["spec/**/*.rb"]
   s.require_paths = ["lib"]
 end

data/lib/flipp.rb

@@ -1,2 +1,2 @@
 require 'flipp/flipp'
-require 'flipp/railties/reestablish_connection' if defined?(Rails)
+require 'flipp/railtie'

data/lib/flipp/flipp.rb

@@ -1,56 +1,58 @@
 require 'rubygems'
 require 'active_record'
 require 'database_exporter'
-require File.join(File.dirname(__FILE__), '../helpers/git_helper')
+require File.join(File.dirname(__FILE__), 'helpers/git_helper')
 
 # The Flipp class orchestrates the actual switching of databaseses
-class Flipp
-  def initialize(branch = GitHelper.current_branch)
-    @branch = branch
-  end
+module Flipp
+  class Flipp
+    def initialize(branch = Flipp::GitHelper.current_branch)
+      @branch = branch
+    end
 
-  def switch_databases
-    current_config = ActiveRecord::Base.connection_pool.spec.config  
-    new_config = current_config.merge!({:database => new_database_name(current_config)})
+    def switch_databases
+      current_config = ActiveRecord::Base.connection_pool.spec.config
+      new_config = current_config.merge!({:database => new_database_name(current_config)})
 
-    puts "Switching databases (#{new_config[:database]})..."
+      puts "Switching databases (#{new_config[:database]})..."
 
-    # Try connecting to the new database
-    begin
-      ActiveRecord::Base.establish_connection new_config
-    rescue
-      create_new_db_or_fallback current_config, new_config
+      # Try connecting to the new database
+      begin
+        ActiveRecord::Base.establish_connection new_config
+      rescue
+        create_new_db_or_fallback current_config, new_config
+      end
     end
-  end
 
-  def create_new_db_or_fallback(current_config, new_config)
-    # Try creating then connecting to the new database
-    begin
-      create_and_copy_data! current_config, new_config
-    rescue => exception
-      # Fallback and use the original config
-      puts "Could not use the new database, falling back to your normal development database..."
-      ActiveRecord::Base.establish_connection current_config
+    def create_new_db_or_fallback(current_config, new_config)
+      # Try creating then connecting to the new database
+      begin
+        create_and_copy_data! current_config, new_config
+      rescue => exception
+        # Fallback and use the original config
+        puts "Could not use the new database, falling back to your normal development database..."
+        ActiveRecord::Base.establish_connection current_config
+      end
     end
-  end
 
-  def new_database_name(config)
-    # The new name for the database
-    # eg. if the original dev database is dev_db and the branch was "new_feature",
-    #     the new database would be db_db_new_feature
-    config[:database] + '_' + @branch
-  end
+    def new_database_name(config)
+      # The new name for the database
+      # eg. if the original dev database is dev_db and the branch was "new_feature",
+      #     the new database would be db_db_new_feature
+      config[:database] + '_' + @branch
+    end
 
-  def create_and_copy_data!(current_config, new_config)
-    # Copy the current development database's data to the new database
-    puts "Copying data to the new database (this could take a minute but will only run once)..."
-    copy_data current_config, new_config
+    def create_and_copy_data!(current_config, new_config)
+      # Copy the current development database's data to the new database
+      puts "Copying data to the new database (this could take a minute but will only run once)..."
+      copy_data current_config, new_config
 
-    # Try out the new database
-    ActiveRecord::Base.establish_connection new_config
-  end
+      # Try out the new database
+      ActiveRecord::Base.establish_connection new_config
+    end
 
-  def copy_data(current_config, new_config)
-    DatabaseExporter.new(current_config).copy(new_config)
+    def copy_data(current_config, new_config)
+      DatabaseExporter.new(current_config).copy(new_config)
+    end
   end
 end

data/lib/flipp/helpers/git_helper.rb

@@ -0,0 +1,37 @@
+require 'fileutils'
+
+module Flipp
+  module Helpers
+    module GitHelper
+      def self.hook_installed?
+        File.exists? '.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 'lib/flipp/git_hooks/post-checkout', File.expand_path('.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.expand_path('.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
+    end
+  end
+end

data/lib/flipp/railtie.rb

@@ -0,0 +1,17 @@
+require 'flipp'
+
+module Flipp
+  class Railtie < Rails::Railtie
+    initializer "restablish_connection.configure_rails_initialization" do
+      if Rails.env.development? and Flipp::GitHelper.hook_installed?
+        # Use the connection determined by flipp
+        flipp = Flipp::Flipp.new
+        flipp.switch_databases
+      end
+
+      rake_tasks do
+        load 'flipp/tasks.rb'
+      end
+    end
+  end
+end

data/{tasks/flipp.rb → lib/flipp/tasks.rb}

@@ -1,15 +1,15 @@
-require File.join(File.dirname(__FILE__), '../lib/helpers/git_helper')
+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
-    GitHelper.install_hook
+    Flipp::GitHelper.install_hook
   end
 
   desc 'Uninstall flipp'
   task :uninstall do
     # Remove git hook
-    GitHelper.uninstall_hook
+    Flipp::GitHelper.uninstall_hook
   end
 end

data/spec/lib/flipp/flipp_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Flipp do
-  let(:flipp) { Flipp.new('new_feature_branch') }
+describe Flipp::Flipp do
+  let(:flipp) { Flipp::Flipp.new('new_feature_branch') }
   let(:old_db) { {:adapter => 'mysql2', :host => 'localhost', :username => 'root', :database => 'old_db'} }
   let(:new_db) { {:adapter => 'mysql2', :host => 'localhost', :username => 'root', :database => 'new_db'} }
 
@@ -40,6 +40,7 @@ describe Flipp do
 
   describe '#create_and_copy_data!' do
     it 'copies the database' do
+      ActiveRecord::Base.stub(:establish_connection)
       flipp.should_receive(:copy_data).with(old_db, new_db)
       flipp.create_and_copy_data!(old_db, new_db)
     end

data/spec/lib/{helpers → flipp/helpers}/git_helper_spec.rb

@@ -1,38 +1,38 @@
 require 'spec_helper'
 
-describe GitHelper do
+describe Flipp::Helpers::GitHelper do
   describe '#hook_installed?' do
     it 'returns true when the hook exists' do
       FileUtils.touch '.git/hooks/post-checkout'
-      GitHelper.hook_installed?.should be_true
+      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'
-      GitHelper.hook_installed?.should be_false
+      Flipp::Helpers::GitHelper.hook_installed?.should be_false
     end
   end
 
   describe '#install_hook' do
     it 'moves the git hook into place' do
-      GitHelper.install_hook
-      FileUtils.compare_file('.git/hooks/post-checkout', File.expand_path('../../../../lib/git_hooks/post-checkout', __FILE__))
+      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 { GitHelper.install_hook }
+    before { Flipp::Helpers::GitHelper.install_hook }
 
     it 'remove the git hook' do
-      GitHelper.uninstall_hook
-      GitHelper.hook_installed?.should be_false
+      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`
-      GitHelper.current_branch.should == 'new_and_fun_branch'
+      Flipp::Helpers::GitHelper.current_branch.should == 'new_and_fun_branch'
 
       # Cleanup
       `git checkout master && git branch -d new_and_fun_branch`

data/spec/spec_helper.rb

@@ -1,3 +1,3 @@
 $:.unshift File.expand_path('../..', __FILE__)
-require 'lib/helpers/git_helper'
+require 'lib/flipp/helpers/git_helper'
 require 'lib/flipp/flipp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipp
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70116653979600 !ruby/object:Gem::Requirement
+  requirement: &70236750364920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116653979600
+  version_requirements: *70236750364920
 - !ruby/object:Gem::Dependency
   name: database_exporter
-  requirement: &70116653979080 !ruby/object:Gem::Requirement
+  requirement: &70236750364320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116653979080
+  version_requirements: *70236750364320
 description: To alleviate issues around highly divergent development databases on
   feature/refactor branches, flipp helps switch databases upon new branch checkouts.
 email:
@@ -44,13 +44,13 @@ files:
 - README.md
 - Rakefile
 - flipp.gemspec
-- tasks/flipp.rb
 - lib/flipp/flipp.rb
-- lib/flipp/railties/reestablish_connection.rb
+- lib/flipp/helpers/git_helper.rb
+- lib/flipp/railtie.rb
+- lib/flipp/tasks.rb
 - lib/flipp.rb
-- lib/helpers/git_helper.rb
 - spec/lib/flipp/flipp_spec.rb
-- spec/lib/helpers/git_helper_spec.rb
+- spec/lib/flipp/helpers/git_helper_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.mikepackdev.com
 licenses: []
@@ -78,5 +78,5 @@ specification_version: 3
 summary: Switch development databases upon branch checkouts.
 test_files:
 - spec/lib/flipp/flipp_spec.rb
-- spec/lib/helpers/git_helper_spec.rb
+- spec/lib/flipp/helpers/git_helper_spec.rb
 - spec/spec_helper.rb

data/lib/flipp/railties/reestablish_connection.rb

@@ -1,11 +0,0 @@
-require 'flipp'
-
-class ReestablishConnection < Rails::Railtie
-  initializer "restablish_connection.configure_rails_initialization" do
-    if Rails.env.development? and GitHelper.hook_installed?
-      # Use the connection determined by flipp
-      flipp = Flipp.new
-      flipp.switch_databases
-    end
-  end
-end

data/lib/helpers/git_helper.rb

@@ -1,33 +0,0 @@
-require 'fileutils'
-
-module GitHelper
-  def self.hook_installed?
-    File.exists? '.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 'lib/git_hooks/post-checkout', File.expand_path('.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.expand_path('.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
-end