bard 0.19.2 → 0.20.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 02b8af12d5e8b586b968b4ca9013bf254721792e
+  data.tar.gz: 0ca8d631a309b80d8d159a72db5a24296c5dbd00
+SHA512:
+  metadata.gz: b53174e6149124a50d836ed7209df93338f0024493cb3b9f283dfcf9c3e35b0d2bd8f9ff9a5eb93a413016b21ff13ab21fe4d808f8fb1756ffe561fd534375ce
+  data.tar.gz: 95d3290c6155ebb4381e06b744f475d90ebb620c4cbe1f01339e0bdc81945c6f0fd74b2aa8cfb5f46273ff0c433a3fa7ac70395de49732521554de8cf888226d

data/VERSION

@@ -1 +1 @@
-0.19.2
+0.20.0

data/bard.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor", "0.11.7"
   gem.add_dependency "capistrano", "2.5.10"
   gem.add_dependency "rvm-capistrano"
-  gem.add_dependency "grit", "1.1.1"
   gem.add_dependency "systemu", ">=1.2.0"
   gem.add_dependency "term-ansicolor", ">=1.0.3"
   gem.add_dependency "bard-rake", ">=0.1.1"

data/bin/bard

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
+require "rubygems"
 require File.dirname(__FILE__) + "/../lib/bard"
-begin
-  Bard.start ARGV
-rescue Bard::Error => e
-  fatal e.message
-end
+Bard::CLI.start ARGV
+

data/lib/bard.rb

@@ -1,54 +1,16 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
-require 'rubygems'
-require 'term/ansicolor'
-require 'net/http'
-require 'systemu'
-require 'grit'
-require 'thor'
-
-require 'bard/error'
-require 'bard/git'
-require 'bard/io'
-
-require 'bard/ssh_delegation'
-
-class Bard < Thor
-  include BardGit
-  include BardIO
-
-  VERSION = File.read(File.expand_path(File.dirname(__FILE__) + "../../VERSION")).chomp
-
-  desc "install [PROJECT NAME]", "install and bootstrap existing project"
-  def install(project_name)
-    auto_update!
-    command = <<-BASH
-    git clone git@git.botandrose.com:#{project_name}.git
-
-    cd #{project_name}
-    git checkout integration
-    rvm . do bundle
-    rvm . do bundle exec rake bootstrap
-
-    sudo -s <#{"<EOF"}
-      echo "<VirtualHost *:80>
-        ServerName #{project_name}.local
-        DocumentRoot `pwd`/public
-</VirtualHost>" > /etc/apache2/sites-available/#{project_name}
-      a2ensite #{project_name}
-      apache2ctl restart
-
-      if ! grep "#{project_name}.local" /etc/hosts; then
-        echo 127.0.0.1 #{project_name}.local >> /etc/hosts
-      fi
-EOF
-    BASH
-    exec command
-  end
+
+module Bard; end
+
+require "bard/base"
+require "bard/error"
+require "bard/git"
+
+class Bard::CLI < Thor
+  include Bard::CLI::Git
 
   desc "data [FROM=production, TO=local]", "copy database and assets from FROM to TO"
   def data(from = "production", to = "local")
-    ensure_sanity!(true)
-
     if to == "local"
       if from == "production" and heroku?
         exec "heroku db:pull --confirm #{project_name}"
@@ -66,10 +28,6 @@ EOF
   method_options %w( verbose -v ) => :boolean
   desc "pull", "pull changes to your local machine"
   def pull
-    ensure_sanity!
-
-    warn NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
-
     run_crucial "git pull --rebase origin #{current_branch}", options.verbose?
     run_crucial "bundle && bundle exec rake bootstrap", options.verbose?
   end
@@ -77,10 +35,7 @@ EOF
   method_options %w( verbose -v ) => :boolean
   desc "push", "push local changes out to the remote"
   def push
-    ensure_sanity!
-
     raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
-
     run_crucial "git push origin #{current_branch}", true
   end
 
@@ -165,53 +120,33 @@ EOF
   end
 
   private
-    def heroku?
-      `git remote -v`.include? "production\tgit@heroku.com:"
-    end
 
-    def ci_host
-      "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
-    end
-
-    def has_ci?
-      `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
-    end
+  def heroku?
+    `git remote -v`.include? "production\tgit@heroku.com:"
+  end
 
-    def start_ci
-      `curl -s -I -X POST #{ci_host}/build?token=botandrose`
-    end
+  def ci_host
+    "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
+  end
 
-    def get_last_build_number
-      response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`
-      response.match(/<number>(\d+)<\/number>/)
-      $1 ? $1.to_i : nil
-    end
+  def has_ci?
+    `curl -s -I #{ci_host}/?token=botandrose` =~ /\b200 OK\b/
+  end
 
-    def get_last_time_elapsed
-      response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
-      response.match(/<duration>(\d+)<\/duration>/)
-      $1 ? $1.to_i / 1000 : nil
-    end
+  def start_ci
+    `curl -s -I -X POST #{ci_host}/build?token=botandrose`
+  end
 
-    def ensure_sanity!(dirty_ok = false)
-      auto_update!
-      raise NotInProjectRootError unless File.directory? ".git"
-      raise OnMasterBranchError if current_branch == "master"
-      raise WorkingTreeDirtyError unless `git status`.include? "working directory clean" unless dirty_ok
-    end
+  def get_last_build_number
+    response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`
+    response.match(/<number>(\d+)<\/number>/)
+    $1 ? $1.to_i : nil
+  end
 
-    def auto_update!
-      match = `curl -s http://rubygems.org/api/v1/gems/bard.json`.match(/"version":"([0-9.]+)"/)
-      return unless match
-      required = match[1]
-      if Bard::VERSION != required
-        original_command = [ENV["_"], @_invocations[Bard].first, ARGV].flatten.join(" ")
-        puts "bard gem is out of date... updating to new version"
-        exec "gem install bard && #{original_command}"
-      end
-      if options.verbose?
-        puts green("#{"bard".ljust(9)} (#{Bard::VERSION})") 
-      end
-    end
+  def get_last_time_elapsed
+    response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
+    response.match(/<duration>(\d+)<\/duration>/)
+    $1 ? $1.to_i / 1000 : nil
+  end
 end
 

data/lib/bard/base.rb

@@ -0,0 +1,28 @@
+require "thor"
+require "term/ansicolor"
+require "systemu"
+
+class Bard::CLI < Thor
+  include Term::ANSIColor
+
+  private
+
+  def fatal(message)
+    raise Bard::CLI::Error, red("!!! ") + message
+  end
+
+  def run_crucial(command, verbose = false)
+    status, stdout, stderr = systemu command
+    fatal "Running command: #{yellow(command)}: #{stderr}" if status.to_i.nonzero?
+    if verbose
+      $stdout.puts stdout
+      $stderr.puts stderr
+    end
+    stdout.chomp
+  end
+
+  def project_name
+    @project_name ||= File.expand_path(".").split("/").last
+  end
+end
+

data/lib/bard/error.rb

@@ -1,28 +1,23 @@
-class Bard < Thor
-  {
-    "NonFastForwardError"       => "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work, and try again",
-    "MasterNonFastForwardError" => "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.",
-    "NotInProjectRootError"     => "You are not in the project's root directory!",
-    "OnMasterBranchError"       => "You are on the master branch!\n  This is almost always a bad idea. Please work on a topic branch. If you have made changes on this branch, please see Micah for assistance.",
-    "WorkingTreeDirtyError"     => "You have uncommitted changes!\n  Please run git commit before attempting to push or pull.",
-    "StagingDetachedHeadError"  => "The staging server is on a detached HEAD!\n  Please see Micah for assistance."
-  }.each do |error, message|
-    eval <<-RUBY
-    class #{error} < Bard::Error
-      def message
-        %q{#{message}}
-      end
+class Bard::CLI < Thor
+  class NonFastForwardError < Bard::CLI::Error
+    def message
+      "Someone has pushed some changes since you last pulled.\n  Kindly run bard pull, ensure that your your changes still work, and try again"
+    end
+  end
+
+  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."
     end
-  RUBY
   end
   
-  class TestsFailedError < Bard::Error
+  class TestsFailedError < Bard::CLI::Error
     def message
       "Automated tests failed!\n  See #{super} for more info."
     end
   end
 
-  class TestsAbortedError < Bard::Error
+  class TestsAbortedError < Bard::CLI::Error
     def message
       "Automated tests aborted!\n  See #{super} for more info."
     end

data/lib/bard/git.rb

@@ -1,46 +1,22 @@
-module BardGit
+module Bard::CLI::Git
   private
-    def current_branch
-      ref = `git symbolic-ref HEAD 2>&1`.chomp
-      return false if ref =~ /^fatal:/
-      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"
-      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 
-      @common_ancestor == root_head
-    end
+  def current_branch
+    ref = `git symbolic-ref HEAD 2>&1`.chomp
+    return false if ref =~ /^fatal:/
+    ref.sub(/refs\/heads\//, '') # refs/heads/master ... we want "master"
+  end
 
-    def find_common_ancestor(head1, head2)
-      run_crucial "git merge-base #{head1} #{head2}"
-    end
+  def fast_forward_merge?(root = "origin/integration", branch = "HEAD")
+    run_crucial "git fetch origin"
+    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 
+    @common_ancestor == root_head
+  end
 
-    def changed_files(old_rev, new_rev)
-      run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
-    end
-
-    def submodule_dirty?
-      @repo ||= Grit::Repo.new "."
-      submodules = Grit::Submodule.config(@repo, @repo.head.name)
-      submodules.any? do |name, submodule|
-        Dir.chdir submodule["path"] do
-          not `git status`.include? "working directory clean"
-        end
-      end
-    end
-
-    def submodule_unpushed?
-      @repo ||= Grit::Repo.new "."
-      submodules = Grit::Submodule.config(@repo, @repo.head.name)
-      submodules.any? do |name, submodule|
-        Dir.chdir submodule["path"] do
-          `git fetch origin`
-          submodule["id"] != `git rev-parse origin/#{current_branch}`.chomp
-        end
-      end
-    end
+  def find_common_ancestor(head1, head2)
+    run_crucial "git merge-base #{head1} #{head2}"
+  end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -10,148 +9,116 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.11.7
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.11.7
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: capistrano
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.5.10
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.5.10
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: rvm-capistrano
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
-  name: grit
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: systemu
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: term-ansicolor
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: bard-rake
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: cucumber
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -189,35 +156,33 @@ files:
 - features/support/grit_ext.rb
 - features/support/io.rb
 - lib/bard.rb
+- lib/bard/base.rb
 - lib/bard/capistrano.rb
 - lib/bard/error.rb
 - lib/bard/git.rb
-- lib/bard/io.rb
-- lib/bard/ssh_delegation.rb
 - spec/bard_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/botandrose/bard
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tools for collaborating with Bot and Rose Design.
 test_files: []

data/lib/bard/io.rb

@@ -1,27 +0,0 @@
-module BardIO
-  include Term::ANSIColor
-  private
-
-    def warn(message)
-      message = message.new.message if message.superclass == Bard::Error
-      $stderr.puts yellow("!   ") + message
-    end
-
-    def fatal(message)
-      raise Bard::Error, red("!!! ") + message
-    end
-
-    def run_crucial(command, verbose = false)
-      status, stdout, stderr = systemu command
-      fatal "Running command: #{yellow(command)}: #{stderr}" if status.to_i.nonzero?
-      if verbose
-        $stdout.puts stdout
-        $stderr.puts stderr
-      end
-      stdout.chomp
-    end
-
-    def project_name
-      @project_name ||= File.expand_path(".").split("/").last
-    end
-end

data/lib/bard/ssh_delegation.rb

@@ -1,31 +0,0 @@
-class Bard < Thor
-  desc "install-authorized-keys", "!!! INTERNAL USE ONLY !!! run as sudo"
-  def install_authorized_keys(source_user, dest_user)
-    source = "/home/#{source_user}/.ssh/authorized_keys"
-    dest = "/home/#{dest_user}/.ssh/authorized_keys"
-
-    file = File.read(source)
-    file.gsub! /gitosis-serve/, "bard delegate"
-
-    File.open(dest, "w") { |f| f.write(file) }
-  end
-
-  desc "delegate", "!!! INTERNAL USER ONLY !!!"
-  def delegate(key)
-    command = ENV['SSH_ORIGINAL_COMMAND']
-
-    case command
-    when /^scp -f (\w+)\.sql\.gz$/
-      project = $1
-      `#{command_for("staging", "cd #{project} && rake db:dump RAILS_ENV=staging && gzip -9f db/data.sql")}`
-      command = "scp -f ~/#{project}/db/data.sql.gz"
-    end
-
-    exec command_for("staging", command)
-  end
-
-  private
-    def command_for(user, command)
-      %(sudo -H -u #{user} bash -c "cd ~ && #{command}")
-    end
-end