bard 0.22.2 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bda3bb2f2fc44cacaafafffecdbb654f762c7a
-  data.tar.gz: 08a9891372e7fa4e0df64d2d9d4160e5bae5a315
+  metadata.gz: cc1c6c9dceac8bcf010f8f0fbcbdf9b6678d21f1
+  data.tar.gz: 2d4b58d4760e2c1c22fc4a1d74cb0c24bacbd567
 SHA512:
-  metadata.gz: 07d9b5bf06e1e00e489952112de2d8fba67f56ff3bfa9f9461c4cadb8e0ad14b024fc1307eeb107b97f7eda68f117b4bedd21d0c4cae3519c97a4abe658e4e43
-  data.tar.gz: 294299ca7e8a3864b9f99c0027cbdaa4f263581bb45c1334e03fd0ddc474a4191d2282de8565f6fe67792fb04f4f957c32d49bc12f53ddaa2b89ef4df6f8d496
+  metadata.gz: c5437ee43af1d313b7712c4e86def8311dd67bae1a90082d6170645030a62d7f6a133f55da4d321f01360c86fd04601aa61c49198b40ff5e38d64f3a40a429c0
+  data.tar.gz: edb8cdb7ce7b8d60eff67b6f4d5fe57a0d1e80e78da93ef8f8bcaa91df4aadc5c043af243097f3ffee3009300d8204891b1a39c86fd9fc1ab4f79b36abee7bdb

data/VERSION

@@ -1 +1 @@
-0.22.2
+0.23.0

data/lib/bard.rb

@@ -35,8 +35,7 @@ class Bard::CLI < Thor
   method_options %w( verbose -v ) => :boolean
   desc "push", "push local changes out to the remote"
   def push
-    raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
-    run_crucial "git push origin #{current_branch}", true
+    run_crucial "git push -u origin #{current_branch}", true
   end
 
   method_options %w( verbose -v ) => :boolean
@@ -50,23 +49,32 @@ class Bard::CLI < Thor
   end
 
   method_options %w( verbose -v ) => :boolean
-  desc "deploy", "pushes, merges integration branch into master and deploys it to production"
+  desc "deploy", "checks that branch is a ff with master, checks with ci, and then merges into master and deploys to production, and deletes branch."
   def deploy
-    invoke :push
+    branch = current_branch
+
+    run_crucial "git fetch origin"
+    raise MasterNonFastForwardError if not fast_forward_merge? "origin/master", "master"
+
+    if branch == "master"
+      run_crucial "git push origin master"
+      invoke :ci
 
-    if has_integration_branch?
-      run_crucial "git fetch origin"
+    else
       run_crucial "git checkout master"
-      run_crucial "git pull --rebase origin master"
-      raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
+      run_crucial "git merge origin/master"
+      run_crucial "git checkout #{branch}"
+      raise MasterNonFastForwardError if not fast_forward_merge? "master", branch
+
+      run_crucial "git push -f origin #{branch}"
 
-      run_crucial "git merge integration"
+      invoke :ci, current_sha
+
+      run_crucial "git checkout master"
+      run_crucial "git merge #{branch}"
       run_crucial "git push origin master"
-      run_crucial "git checkout integration"
     end
 
-    invoke :ci
-
     if heroku?
       run_crucial "git push production master", options.verbose?
       run_crucial "heroku run rake bootstrap:production:post", options.verbose?
@@ -75,17 +83,23 @@ class Bard::CLI < Thor
     end
 
     puts green("Deploy Succeeded")
+
+    if branch != "master"
+      puts "Deleting branch: #{branch}"
+      run_crucial "git push --delete origin #{branch}"
+      run_crucial "git branch -d #{branch}"
+    end
   end
 
   method_options %w( verbose -v ) => :boolean
-  desc "ci", "runs ci against master branch"
-  def ci
+  desc "ci", "runs ci against current HEAD"
+  def ci sha=current_sha
     return unless has_ci?
 
-    puts "Continuous integration: starting build..."
+    puts "Continuous integration: starting build on #{sha}..."
     last_build_number = get_last_build_number
     last_time_elapsed = get_last_time_elapsed
-    start_ci
+    start_ci sha
     sleep(2) while last_build_number == get_last_build_number
 
     start_time = Time.new.to_i
@@ -117,16 +131,12 @@ class Bard::CLI < Thor
       when /<result>SUCCESS<\/result>/ then
         puts "Continuous integration: success! deploying to production"
 
-      else raise "Unknown response from CI server:\n#{response}"
+      else raise "Unknown response from CI server: #{response}"
     end
   end
 
   private
 
-  def has_integration_branch?
-    system 'git show-ref --verify --quiet "refs/heads/integration"'
-  end
-
   def heroku?
     `git remote -v`.include? "production\tgit@heroku.com:"
   end
@@ -139,8 +149,14 @@ class Bard::CLI < Thor
     `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
   end
 
-  def start_ci
-    `curl -s -I -X POST #{ci_host}/build?token=botandrose`
+  def start_ci sha=nil
+    if sha
+      command = "curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{sha}'"
+    else
+      command = "curl -s -I -X POST '#{ci_host}/build?token=botandrose'"
+    end
+    puts command if options.verbose?
+    `#{command}`
   end
 
   def get_last_build_number

data/lib/bard/capistrano.rb

@@ -67,7 +67,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "push app to staging"
   task :stage, :roles => :staging do
-    branch = ENV.has_key?("BRANCH") ? ENV["BRANCH"] : "integration"
+    branch = ENV.fetch("BRANCH")
     run "cd #{application} && git fetch && git checkout -f origin/#{branch} && bundle && bundle exec rake bootstrap:production"
   end
 end

data/lib/bard/error.rb

@@ -7,7 +7,7 @@ class Bard::CLI < Thor
 
   class MasterNonFastForwardError < Bard::CLI::Error
     def message
-      "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your integration branch on top of it, and check for breakage."
+      "The master branch has advanced since last deploy, probably due to a bugfix.\n  Rebase your branch on top of it, and check for breakage."
     end
   end
   

data/lib/bard/git.rb

@@ -7,8 +7,11 @@ module Bard::CLI::Git
     ref.sub(/refs\/heads\//, '') # refs/heads/master ... we want "master"
   end
 
-  def fast_forward_merge?(root = "origin/integration", branch = "HEAD")
-    run_crucial "git fetch origin"
+  def current_sha
+    `git rev-parse HEAD`.chomp
+  end
+
+  def fast_forward_merge?(root, branch)
     root_head = run_crucial "git rev-parse #{root}"
     branch_head = run_crucial "git rev-parse #{branch}"
     @common_ancestor = find_common_ancestor root_head, branch_head 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,84 +43,84 @@ dependencies:
   name: rvm-capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: bard-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: This immaculate work of engineering genius allows mere mortals to collaborate
@@ -132,9 +132,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .gitmodules
+- ".document"
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -171,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []