gta 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5203fbee2e2d319e068c60931f20e6448ad16d
-  data.tar.gz: 179cdb111163594a20540619f8a33aa03c8da2f5
+  metadata.gz: 6a402ae4132a2d3ab9159de4812b34a26e5d0fbe
+  data.tar.gz: 85a81e0cdef130f23ba49c537fc584c86c6390e9
 SHA512:
-  metadata.gz: bd1245d883fda68ea097ba4546eb6eeab6d862e48f9bcb7aa1580361f93dd0f6d2d04753a828ee6148d16264c6c6fcea06b038ffb0407aa0206775a6ed66f144
-  data.tar.gz: dd9a458a4099033f042ebf38e9432a81d2267e0a5bf742ddb862e5fa55cf5b671fae4e4ce01e9cfb122860fb82825f415254dab5ed4eeb800e177277ce142e5b
+  metadata.gz: fb6112662bae1c01c45610fb22b7f9ebac9ee3604f274a99cce2b0290841d848cf1ee13a48b2bdecd5a20bb145208dca02cb8456c9c69bcbd0388c37a30be8bf
+  data.tar.gz: e8ca1779c9613c309009227ac9d7f03ea2762aaefa4c7786a3d39a586ceb2fff96f2e7976bbc1c0ec4c2fa1b6d5933d2b41fb32ccee0022878bfcf212f15d827

data/lib/gta.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'ansi/code'
+require 'json'
 
 require "gta/version"
 require "gta/sh"
@@ -12,3 +13,4 @@ require "gta/hotfix"
 require "gta/tag_finder"
 require "gta/commander"
 require "gta/file_logger"
+require "gta/diff"

data/lib/gta/db.rb

@@ -1,10 +1,9 @@
 module GTA
   class DB
-    attr_reader :gta_config_path, :database_config_path, :local_env
+    attr_reader :gta_config_path, :local_env
 
-    def initialize(gta_config_path=nil, database_config_path=nil, local_env=nil)
+    def initialize(gta_config_path=nil, local_env=nil)
       @gta_config_path = gta_config_path
-      @database_config_path = database_config_path
       @local_env = local_env || 'development'
     end
 
@@ -13,7 +12,7 @@ module GTA
     end
 
     def local_db
-      @local_db ||= LocalDB.new(local_env, database_config_path)
+      @local_db ||= LocalDB.new(local_env, manager.database_config_path)
     end
 
     def fetch(stage_name=nil)

data/lib/gta/diff.rb

@@ -0,0 +1,45 @@
+module GTA
+  class Diff
+    include Sh
+
+    attr_reader :source_name, :destination_name, :gta_config_path
+
+    DEFAULT_FORMAT = 'short'
+
+    def initialize(source_name, destination_name, gta_config_path=nil)
+      @source_name = source_name
+      @destination_name = destination_name
+      @gta_config_path = gta_config_path
+    end
+
+    def manager
+      @manager ||= Manager.new(gta_config_path)
+    end
+
+    def source
+      @source ||= manager.stage!(source_name)
+    end
+
+    def destination
+      @destination ||= manager.stage!(destination_name)
+    end
+
+    def report(format=DEFAULT_FORMAT)
+      source.fetch!
+      destination.fetch!
+      sh("git log #{source.name}/master..#{destination.name}/master --format=#{format}")
+    end
+
+    def shas
+      report('%h')
+    end
+
+    def cherry_pick
+      commits = shas.split("\n")
+      sh("git checkout #{destination.name}")
+      commits.each do |sha|
+        sh("git cherry-pick #{sha}")
+      end
+    end
+  end
+end

data/lib/gta/local_db.rb

@@ -14,11 +14,23 @@ module GTA
     end
 
     def config
-      @config ||= YAML.load(File.read(database_config_path))[env]
+      @config ||= parsed_config[env]
+    end
+
+    def file_contents
+      File.read(database_config_path)
+    end
+
+    def parsed_config
+      database_config_path.match(/yml$/) ? YAML.load(file_contents) : JSON.parse(file_contents)
+    end
+
+    def _username
+      config['username'] || config['user']
     end
 
     def username
-      config['username'] ? " -U #{config['username']}" : ''
+      _username ? " -U #{_username}" : ''
     end
 
     def database
@@ -29,10 +41,6 @@ module GTA
       "#{Dir.pwd}/config/database.yml"
     end
 
-    def self.env_config
-      ENV['GTA_DATABASE_CONFIG_PATH']
-    end
-
     def self.local_database_env
       ENV['RAILS_ENV'] || ENV['GTA_LOCAL_ENV']
     end

data/lib/gta/manager.rb

@@ -20,6 +20,10 @@ module GTA
       @app_name || config && @app_name
     end
 
+    def database_config_path
+      @database_config_path || config && @database_config_path
+    end
+
     def checkout(name)
       stage!(name).checkout
     end
@@ -41,8 +45,17 @@ module GTA
     def config
       return @config if @config
       parsed = YAML.load(File.read(config_path))
-      @app_name = parsed.keys.first
-      @config = parsed.values.first
+      @app_name = parsed['name']
+      @database_config_path = find_database_config(parsed['database_config'])
+      @config = parsed['stages']
+    end
+
+    def find_database_config(path)
+      if path
+        File.dirname(config_path) + "/#{path}"
+      else
+        LocalDB.default_database_config_path
+      end
     end
 
     def stages

data/lib/gta/tasks/diff.rb

@@ -0,0 +1,16 @@
+namespace :gta do
+  def gta_differ(args)
+    @differ ||= GTA::Diff.new(args[:source_stage], args[:destination_stage], GTA::Manager.env_config)
+  end
+
+  namespace :diff do
+    task :cherry_pick, :source_stage, :destination_stage do |t, args|
+      gta_differ(args).cherry_pick
+    end
+  end
+
+  desc "report commit differences between stages"
+  task :report, :source_stage, :destination_stage do |t, args|
+    gta_differ(args).report
+  end
+end

data/lib/gta/tasks/heroku_db.rake

@@ -2,7 +2,7 @@ namespace :gta do
   namespace :heroku do
     namespace :db do
       def gta_db
-        @gta_db ||= GTA::DB.new(GTA::Manager.env_config, GTA::LocalDB.env_config, GTA::LocalDB.local_database_env)
+        @gta_db ||= GTA::DB.new(GTA::Manager.env_config, GTA::LocalDB.local_database_env)
       end
 
       desc 'download the database from the specified stage or from the last stage'

data/lib/gta/version.rb

@@ -1,3 +1,3 @@
 module GTA
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/diff_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe GTA::Diff do
+  let(:gta_config_path) { File.dirname(__FILE__) + "/fixtures/config/gta.yml" }
+  let(:diff) { GTA::Diff.new('staging', 'production', gta_config_path) }
+
+  before do
+    diff.stub(:sh)
+    diff.source.stub(:fetch!)
+    diff.destination.stub(:fetch!)
+  end
+
+  describe 'stages' do
+    it "gets a source from the manager" do
+      diff.source.name.should == 'staging'
+    end
+
+    it "gets a destination from the manager" do
+      diff.destination.name.should == 'production'
+    end
+  end
+
+  describe '#report' do
+    it "should fetch the stages" do
+      diff.source.should_receive(:fetch!)
+      diff.destination.should_receive(:fetch!)
+
+      diff.report
+    end
+
+    it "sends the right command" do
+      diff.should_receive(:sh)
+        .with("git log staging/master..production/master --format=short")
+      diff.report
+    end
+  end
+
+  describe '#cherry_pick' do
+    let(:cherry_pick_commands) { [] }
+    let(:checkout_commands) { [] }
+
+    before do
+      diff.stub(:sh) do |command|
+        if command.match(/git log/)
+          "12345\n23456\n34567\n"
+        elsif command.match(/git checkout/)
+          checkout_commands << command
+        else
+          cherry_pick_commands << command
+        end
+      end
+    end
+
+    it "checks out the destination" do
+      diff.cherry_pick
+      checkout_commands.first.should == "git checkout production"
+    end
+
+    it "sends a cherry pick command for each sha" do
+      diff.cherry_pick
+      cherry_pick_commands.should == [
+        "git cherry-pick 12345",
+        "git cherry-pick 23456",
+        "git cherry-pick 34567",
+      ]
+    end
+  end
+end

data/spec/fixtures/config/database.json

@@ -0,0 +1,22 @@
+{
+  "development": {
+    "driver": "pg",
+    "host": "localhost",
+    "user": "socialchorus",
+    "database": "linktivator_development"
+  },
+
+  "test": {
+    "driver": "pg",
+    "host": "localhost",
+    "user": "socialchorus",
+    "database": "linktivator_test"
+  },
+
+  "nimbus": {
+    "driver": "pg",
+    "host": "localhost",
+    "user": "socialchorus",
+    "database": "linktivator_test"
+  }
+}

data/spec/fixtures/config/gta.yml

@@ -1,4 +1,7 @@
-activator:
+database_config: database.yml # relative from the config file
+name: activator
+
+stages:
   origin:
     repository: git@github.com:socialchorus/activator.git
 

data/spec/local_db_spec.rb

@@ -13,4 +13,15 @@ describe GTA::LocalDB do
       local_db.load("~/Downloads/activator-staging.sql")
     end
   end
+
+  context 'when the database config is not yml' do
+    let(:database_config_path) { File.dirname(__FILE__) + "/fixtures/config/database.json" }
+
+    it "loads the config via json" do
+      local_db.should_receive(:sh).with(
+        "pg_restore --verbose --clean --no-acl --no-owner -h localhost -U socialchorus -d linktivator_development ~/Downloads/activator-staging.sql"
+      )
+      local_db.load("~/Downloads/activator-staging.sql")
+    end
+  end
 end

data/spec/manager_spec.rb

@@ -13,6 +13,11 @@ describe GTA::Manager do
     manager.app_name.should == 'activator'
   end
 
+  it "has a reference to the database config file" do
+    File.expand_path(manager.database_config_path).should ==
+      File.expand_path(File.dirname(__FILE__) + "/fixtures/config/database.yml")
+  end
+
   describe '#fetch' do
     it "loops through each stage and calls fetch" do
       manager.stages.each do |stage|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gta
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - socialchorus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -86,6 +86,7 @@ files:
 - lib/gta.rb
 - lib/gta/commander.rb
 - lib/gta/db.rb
+- lib/gta/diff.rb
 - lib/gta/file_logger.rb
 - lib/gta/heroku_db.rb
 - lib/gta/hotfix.rb
@@ -98,6 +99,7 @@ files:
 - lib/gta/tasks.rb
 - lib/gta/tasks/commander.rb
 - lib/gta/tasks/deploy.rake
+- lib/gta/tasks/diff.rb
 - lib/gta/tasks/gta.rake
 - lib/gta/tasks/heroku.rake
 - lib/gta/tasks/heroku_db.rake
@@ -105,6 +107,8 @@ files:
 - lib/gta/version.rb
 - spec/commander_spec.rb
 - spec/db_spec.rb
+- spec/diff_spec.rb
+- spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/gta.yml
 - spec/heroku_db_spec.rb
@@ -143,6 +147,8 @@ summary: 'GTA: the Git Transit Authority - A git based deploy tool for moving co
 test_files:
 - spec/commander_spec.rb
 - spec/db_spec.rb
+- spec/diff_spec.rb
+- spec/fixtures/config/database.json
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/gta.yml
 - spec/heroku_db_spec.rb