boxen 0.6.0 → 0.7.1

data/.gitignore

@@ -1,7 +1,10 @@
 /.bundle
 /.env.local.rb
+/.projects
 /.rbenv-version
+/.ruby-version
 /Gemfile.lock
 /bin
 /boxen-*.gem
+/log
 /puppet

data/README.md

@@ -19,27 +19,16 @@ Manage Mac development boxes with love (and Puppet).
 
 Sometimes it's not possible to follow these rules, but try hard.
 
-## Contributing
+## Hooks
 
-Use the OS X system Ruby (1.8.7). Run `script/tests` often. Open PR's.
+0. All hooks must be in the namespace `Boxen::Hook::MyThing`.
 
-### Managing Boxen's Puppet Modules
+0. All hooks must subclass from `Boxen::Hook`
 
-There are roughly nine million puppet modules under the
-[Boxen GitHub organization][boxen]. To clone them all, run
-`script/sync-puppet`. This script will make sure every
-`boxen/puppet-*` repo is cloned under the `./puppet` directory, which is
-ignored by Git.
+0. All hooks must provide a private instance method `required_environment_variables` that returns an array with at least one entry.
 
-[boxen]: https://github.com/boxen
+0. All hooks must provide a private instance method `#call`.
 
-Because it uses the GitHub API, `script/sync-puppet` requires the
-`GITHUB_LOGIN` and `GITHUB_PASSWORD` environment variables to be set.
-If you don't want to provide them every time, you can set them in
-`.env.local.rb`, which is also ignored by Git. For example, your
-`.env.local.rb` might look like this:
+## Contributing
 
-```ruby
-ENV["GITHUB_LOGIN"]    = "jbarnette"
-ENV["GITHUB_PASSWORD"] = "adventures"
-```
+Use the OS X system Ruby (1.8.7). Run `script/tests` often. Open PR's.

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "0.6.0"
+  gem.version       = "0.7.1"
   gem.authors       = ["John Barnette", "Will Farrington"]
   gem.email         = ["jbarnette@github.com", "wfarr@github.com"]
   gem.description   = "Manage Mac development boxes with love (and Puppet)."
@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "octokit",          "~> 1.15"
   gem.add_dependency "puppet",           "~> 3.0"
 
-  gem.add_development_dependency "minitest", "3.5.0" # pinned for mocha
-  gem.add_development_dependency "mocha", "~> 0.12"
+  gem.add_development_dependency "minitest", "4.4.0" # pinned for mocha
+  gem.add_development_dependency "mocha",    "~> 0.13"
 end

data/lib/boxen/cli.rb

@@ -43,11 +43,6 @@ module Boxen
 
       Boxen::Preflight.run config
 
-      # Okay, we're gonna run Puppet. Let's make some dirs.
-
-      Boxen::Util.sudo("/bin/mkdir", "-p", config.homedir) &&
-        Boxen::Util.sudo("/usr/sbin/chown", "#{config.user}:staff", config.homedir)
-
       # Save the config for Puppet (and next time).
 
       Boxen::Config.save config

data/lib/boxen/hook.rb

@@ -0,0 +1,40 @@
+module Boxen
+  class Hook
+    attr_reader :config
+    attr_reader :checkout
+    attr_reader :puppet
+    attr_reader :result
+
+    def self.all
+      [
+        Boxen::Hook::GitHubIssue,
+        Boxen::Hook::Web
+      ]
+    end
+
+    def initialize(config, checkout, puppet, result)
+      @config   = config
+      @checkout = checkout
+      @puppet   = puppet
+      @result   = result
+    end
+
+    def enabled?
+      required_vars = Array(required_environment_variables)
+      required_vars.any? && required_vars.all? do |var|
+        ENV[var] && !ENV[var].empty?
+      end
+    end
+
+    def perform?
+      false
+    end
+
+    def run
+      call if perform?
+    end
+  end
+end
+
+require "boxen/hook/github_issue"
+require "boxen/hook/web"

data/lib/boxen/hook/github_issue.rb

@@ -0,0 +1,115 @@
+require "boxen/hook"
+
+module Boxen
+  class Hook
+    class GitHubIssue < Hook
+      def perform?
+        enabled? && !config.stealth? && !config.pretend? && checkout.master?
+      end
+
+      def call
+        if result.success?
+          close_failures
+        else
+          warn "Sorry! Creating an issue on #{config.reponame}."
+          record_failure
+        end
+      end
+
+      def compare_url
+        return unless config.reponame
+        "https://github.com/#{config.reponame}/compare/#{checkout.sha}...master"
+      end
+
+      def hostname
+        `hostname`.strip
+      end
+
+      def os
+        `sw_vers -productVersion`.strip
+      end
+
+      def shell
+        ENV["SHELL"]
+      end
+
+      def log
+        File.read config.logfile
+      end
+
+      def record_failure
+        return unless issues?
+
+        title = "Failed for #{config.user}"
+        config.api.create_issue(config.reponame, title, failure_details,
+          :labels => [failure_label])
+      end
+
+      def close_failures
+        return unless issues?
+
+        comment = "Succeeded at version #{checkout.sha}."
+        failures.each do |issue|
+          config.api.add_comment(config.reponame, issue.number, comment)
+          config.api.close_issue(config.reponame, issue.number)
+        end
+      end
+
+      def failures
+        return [] unless issues?
+
+        issues = config.api.list_issues(config.reponame, :state => 'open',
+          :labels => failure_label, :creator => config.login)
+        issues.reject! {|i| i.labels.collect(&:name).include?(ongoing_label)}
+        issues
+      end
+
+      def failure_details
+        body = ''
+        body << "Running on `#{hostname}` (OS X #{os}) under `#{shell}`, "
+        body << "version #{checkout.sha} ([compare to master](#{compare_url}))."
+        body << "\n\n"
+
+        if checkout.dirty?
+          body << "### Changes"
+          body << "\n\n"
+          body << "```\n#{checkout.changes}\n```"
+          body << "\n\n"
+        end
+
+        body << "### Puppet Command"
+        body << "\n\n"
+        body << "```\n#{puppet.command.join(' ')}\n```"
+        body << "\n\n"
+
+        body << "### Output (from #{config.logfile})"
+        body << "\n\n"
+        body << "```\n#{log}\n```\n"
+
+        body
+      end
+
+      def failure_label
+        @failure_label ||= 'failure'
+      end
+      attr_writer :failure_label
+
+      def ongoing_label
+        @ongoing_label ||= 'ongoing'
+      end
+      attr_writer :ongoing_label
+
+      def issues?
+        return unless config.reponame
+        return if config.reponame == 'boxen/our-boxen'
+
+        config.api.repository(config.reponame).has_issues
+      end
+
+      private
+      def required_environment_variables
+        ['BOXEN_ISSUES_ENABLED']
+      end
+    end
+  end
+end

data/lib/boxen/hook/web.rb

@@ -0,0 +1,54 @@
+require "boxen/hook"
+require "json"
+require "net/http"
+
+module Boxen
+  class Hook
+    class Web < Hook
+      def perform?
+        enabled?
+      end
+
+      private
+      def call
+        payload = {
+          :login  => config.user,
+          :sha    => checkout.sha,
+          :status => result.success? ? 'success' : 'failure',
+          :time   => "#{Time.now.utc.to_i}"
+        }
+
+        post_web_hook payload
+      end
+
+      def post_web_hook(payload)
+        headers = { 'Content-Type' => 'application/json' }
+
+        uri = URI.parse(URI.escape(ENV['BOXEN_WEB_HOOK_URL']))
+
+        user, pass, host, port, path = \
+          uri.user, uri.pass, uri.host, uri.port, uri.path
+
+        request = Net::HTTP::Post.new(path, initheader = headers)
+
+        if uri.scheme =~ /https/
+          http.use_ssl = true
+        end
+
+        if user && pass
+          request.basic_auth user, pass
+        end
+
+        request.body = payload.to_json
+
+        response = Net::HTTP.new(host, port).start do |http|
+          http.request(request)
+        end
+      end
+
+      def required_environment_variables
+        ['BOXEN_WEB_HOOK_URL']
+      end
+    end
+  end
+end

data/lib/boxen/preflight/creds.rb

@@ -32,8 +32,9 @@ class Boxen::Preflight::Creds < Boxen::Preflight
 
     config.login = console.ask "GitHub login: " do |q|
       q.default = config.login || config.user
+      q.validate = /\A[^@]+\Z/
     end
-
+  
     config.password = console.ask "GitHub password: " do |q|
       q.echo = "*"
     end

data/lib/boxen/preflight/directories.rb

@@ -0,0 +1,32 @@
+require "boxen/preflight"
+require "boxen/util"
+
+class Boxen::Preflight::Directories < Boxen::Preflight
+  def ok?
+    homedir_directory_exists? &&
+      homedir_owner == config.user &&
+      homedir_group == 'staff'
+  end
+
+  def run
+    Boxen::Util.sudo("/bin/mkdir", "-p", config.homedir) &&
+      Boxen::Util.sudo("/usr/sbin/chown", "#{config.user}:staff", config.homedir)
+  end
+
+  private
+  def homedir_directory_exists?
+    File.directory?(config.homedir)
+  end
+
+  def homedir_owner
+    Etc.getpwuid(homedir_stat.uid).name
+  end
+
+  def homedir_group
+    Etc.getgrgid(homedir_stat.gid).name
+  end
+
+  def homedir_stat
+    @homedir_stat ||= File.stat(config.homedir)
+  end
+end

data/lib/boxen/puppeteer.rb

@@ -50,6 +50,8 @@ module Boxen
       flags << "--no-report"
       flags << "--detailed-exitcodes"
 
+      flags << "--show_diff"
+
       if config.profile?
         flags << "--evaltrace"
         flags << "--summarize"

data/lib/boxen/runner.rb

@@ -1,8 +1,8 @@
 require "boxen/checkout"
 require "boxen/config"
+require "boxen/hook"
 require "boxen/flags"
 require "boxen/puppeteer"
-require "boxen/reporter"
 require "boxen/util"
 require "facter"
 
@@ -12,14 +12,14 @@ module Boxen
     attr_reader :flags
     attr_reader :puppet
     attr_reader :checkout
-    attr_reader :reporter
+    attr_reader :hooks
 
     def initialize(config, flags)
-      @config = config
-      @flags  = flags
+      @config   = config
+      @flags    = flags
       @puppet   = Boxen::Puppeteer.new(@config)
       @checkout = Boxen::Checkout.new(@config)
-      @reporter = Boxen::Reporter.new(@config, @checkout, @puppet)
+      @hooks    = Boxen::Hook.all
     end
 
     def process
@@ -41,14 +41,7 @@ module Boxen
     end
 
     def report(result)
-      return result unless issues?
-
-      if result.success?
-        reporter.close_failures
-      else
-        warn "Sorry! Creating an issue on #{config.reponame}."
-        reporter.record_failure
-      end
+      hooks.each { |hook| hook.new(config, checkout, puppet, result).run }
 
       result
     end
@@ -107,11 +100,5 @@ module Boxen
         f.write projects
       end
     end
-
-    # Should the result of this run have any effect on GitHub issues?
-
-    def issues?
-      !config.stealth? && !config.pretend? && checkout.master?
-    end
   end
 end

data/lib/facter/boxen.rb

@@ -4,6 +4,7 @@ require "boxen/config"
 config   = Boxen::Config.load
 facts    = {}
 factsdir = "#{config.homedir}/config/facts"
+dot_boxen = "#{ENV['HOME']}/.boxen"
 
 facts["github_login"]  = config.login
 facts["github_email"]  = config.email
@@ -20,4 +21,8 @@ Dir["#{config.homedir}/config/facts/*.json"].each do |file|
   facts.merge! JSON.parse File.read file
 end
 
+if File.exist? dot_boxen
+  facts.merge! JSON.parse(File.read(dot_boxen))
+end
+
 facts.each { |k, v| Facter.add(k) { setcode { v } } }

data/test/boxen/test.rb

@@ -1,5 +1,5 @@
 require "minitest/autorun"
-require "mocha"
+require "mocha/setup"
 
 module Boxen
   class Test < MiniTest::Unit::TestCase

data/test/boxen_directories_test.rb

@@ -0,0 +1,40 @@
+require 'boxen/test'
+require 'boxen/preflight/directories'
+
+class BoxenPreflightDirectoriesTest < Boxen::Test
+  class TestConfig
+    def user;    "foobar"; end
+    def homedir; "foobar"; end
+  end
+
+  def setup
+    @config = TestConfig.new
+  end
+
+  def test_not_okay_if_homedir_group_wrong
+    directories = Boxen::Preflight::Directories.new(@config)
+    directories.stubs(:homedir_group).returns(false)
+    refute directories.ok?
+  end
+
+  def test_not_okay_if_homedir_owner_wrong
+    directories = Boxen::Preflight::Directories.new(@config)
+    directories.stubs(:homedir_owner).returns(false)
+    refute directories.ok?
+  end
+
+  def test_not_okay_unless_homedir_exists
+    directories = Boxen::Preflight::Directories.new(@config)
+    directories.stubs(:homedir_directory_exists?).returns(false)
+    refute directories.ok?
+  end
+
+  def test_okay_if_allchecks_fine
+    directories = Boxen::Preflight::Directories.new(@config)
+    directories.stubs(:homedir_directory_exists?).returns(true)
+    directories.stubs(:homedir_owner).returns("foobar")
+    directories.stubs(:homedir_group).returns("staff")
+
+    assert directories.ok?
+  end
+end

data/test/{boxen_reporter_test.rb → boxen_hook_github_issue_test.rb}

@@ -1,16 +1,50 @@
 require "boxen/test"
-require "boxen/reporter"
+require "boxen/hook/github_issue"
 
 class Boxen::Config
   attr_writer :api
 end
 
-class BoxenReporterTest < Boxen::Test
+class BoxenHookGitHubIssueTest < Boxen::Test
   def setup
     @config   = Boxen::Config.new
     @checkout = Boxen::Checkout.new(@config)
     @puppet   = mock 'puppeteer'
-    @reporter = Boxen::Reporter.new @config, @checkout, @puppet
+    @result   = stub 'result', :success? => true
+    @hook = Boxen::Hook::GitHubIssue.new @config, @checkout, @puppet, @result
+  end
+
+  def test_enabled
+    original = ENV['BOXEN_ISSUES_ENABLED']
+
+    ENV['BOXEN_ISSUES_ENABLED'] = nil
+    refute @hook.enabled?
+
+    ENV['BOXEN_ISSUES_ENABLED'] = 'duh'
+    assert @hook.enabled?
+
+    ENV['BOXEN_ISSUES_ENABLED'] = original
+  end
+
+  def test_perform
+    @hook.stubs(:enabled?).returns(false)
+    @config.stubs(:stealth?).returns(true)
+    @config.stubs(:pretend?).returns(true)
+    @checkout.stubs(:master?).returns(false)
+
+    refute @hook.perform?
+
+    @hook.stubs(:enabled?).returns(true)
+    refute @hook.perform?
+
+    @config.stubs(:stealth?).returns(false)
+    refute @hook.perform?
+
+    @config.stubs(:pretend?).returns(false)
+    refute @hook.perform?
+
+    @checkout.stubs(:master?).returns(true)
+    assert @hook.perform?
   end
 
   def test_compare_url
@@ -19,97 +53,98 @@ class BoxenReporterTest < Boxen::Test
     @checkout.expects(:sha).returns(sha)
 
     expected = "https://github.com/#{repo}/compare/#{sha}...master"
-    assert_equal expected, @reporter.compare_url
+    assert_equal expected, @hook.compare_url
   end
 
   def test_hostname
-    @reporter.expects(:"`").with("hostname").returns "whatevs.local\n"
-    assert_equal "whatevs.local", @reporter.hostname
+    @hook.expects(:"`").with("hostname").returns "whatevs.local\n"
+    assert_equal "whatevs.local", @hook.hostname
   end
 
   def test_initialize
-    reporter = Boxen::Reporter.new :config, :checkout, :puppet
-    assert_equal :config,   reporter.config
-    assert_equal :checkout, reporter.checkout
-    assert_equal :puppet,   reporter.puppet
+    hook = Boxen::Hook::GitHubIssue.new :config, :checkout, :puppet, :result
+    assert_equal :config,   hook.config
+    assert_equal :checkout, hook.checkout
+    assert_equal :puppet,   hook.puppet
+    assert_equal :result,   hook.result
   end
 
   def test_os
-    @reporter.expects(:"`").with("sw_vers -productVersion").returns "11.1.1\n"
-    assert_equal "11.1.1", @reporter.os
+    @hook.expects(:"`").with("sw_vers -productVersion").returns "11.1.1\n"
+    assert_equal "11.1.1", @hook.os
   end
 
   def test_shell
     val = ENV['SHELL']
 
     ENV['SHELL'] = '/bin/crush'
-    assert_equal "/bin/crush", @reporter.shell
+    assert_equal "/bin/crush", @hook.shell
 
     ENV['SHELL'] = val
   end
 
   def test_record_failure
-    @reporter.stubs(:issues?).returns(true)
+    @hook.stubs(:issues?).returns(true)
 
     details = 'Everything went wrong.'
-    @reporter.stubs(:failure_details).returns(details)
+    @hook.stubs(:failure_details).returns(details)
 
     @config.reponame = repo = 'some/repo'
     @config.user     = user = 'hapless'
 
-    @reporter.failure_label = label = 'boom'
+    @hook.failure_label = label = 'boom'
 
     @config.api = api = mock('api')
     api.expects(:create_issue).with(repo, "Failed for #{user}", details, :labels => [label])
 
-    @reporter.record_failure
+    @hook.record_failure
   end
 
   def test_record_failure_no_issues
-    @reporter.stubs(:issues?).returns(false)
+    @hook.stubs(:issues?).returns(false)
 
     @config.api = api = mock('api')
     api.expects(:create_issue).never
 
-    @reporter.record_failure
+    @hook.record_failure
   end
 
   def test_failure_label
     default = 'failure'
-    assert_equal default, @reporter.failure_label
+    assert_equal default, @hook.failure_label
 
-    @reporter.failure_label = label = 'oops'
-    assert_equal label, @reporter.failure_label
+    @hook.failure_label = label = 'oops'
+    assert_equal label, @hook.failure_label
 
-    @reporter.failure_label = nil
-    assert_equal default, @reporter.failure_label
+    @hook.failure_label = nil
+    assert_equal default, @hook.failure_label
   end
 
   def test_ongoing_label
     default = 'ongoing'
-    assert_equal default, @reporter.ongoing_label
+    assert_equal default, @hook.ongoing_label
 
-    @reporter.ongoing_label = label = 'checkit'
-    assert_equal label, @reporter.ongoing_label
+    @hook.ongoing_label = label = 'checkit'
+    assert_equal label, @hook.ongoing_label
 
-    @reporter.ongoing_label = nil
-    assert_equal default, @reporter.ongoing_label
+    @hook.ongoing_label = nil
+    assert_equal default, @hook.ongoing_label
   end
 
   def test_failure_details
     sha = 'decafbad'
     @checkout.stubs(:sha).returns(sha)
     hostname = 'cools.local'
-    @reporter.stubs(:hostname).returns(hostname)
+    @hook.stubs(:hostname).returns(hostname)
     shell = '/bin/ksh'
-    @reporter.stubs(:shell).returns(shell)
+    @hook.stubs(:shell).returns(shell)
     os = '11.1.1'
-    @reporter.stubs(:os).returns(os)
+    @hook.stubs(:os).returns(os)
     log = "so\nmany\nthings\nto\nreport"
-    @reporter.stubs(:log).returns(log)
+    @hook.stubs(:log).returns(log)
 
     @config.reponame = repo = 'some/repo'
-    compare = @reporter.compare_url
+    compare = @hook.compare_url
     changes = 'so many changes'
     @checkout.stubs(:changes).returns(changes)
 
@@ -119,7 +154,7 @@ class BoxenReporterTest < Boxen::Test
 
     @config.logfile = logfile = '/path/to/logfile.txt'
 
-    details = @reporter.failure_details
+    details = @hook.failure_details
 
     assert_match sha,      details
     assert_match hostname, details
@@ -138,7 +173,7 @@ class BoxenReporterTest < Boxen::Test
     log = 'a bunch of log data'
     File.expects(:read).with(logfile).returns(log)
 
-    assert_equal log, @reporter.log
+    assert_equal log, @hook.log
   end
 
 
@@ -150,12 +185,12 @@ class BoxenReporterTest < Boxen::Test
   Label = Struct.new(:name)
 
   def test_close_failures
-    @reporter.stubs(:issues?).returns(true)
+    @hook.stubs(:issues?).returns(true)
 
     @config.reponame = repo = 'some/repo'
 
     issues = Array.new(3) { |i|  Issue.new(i*2 + 2) }
-    @reporter.stubs(:failures).returns(issues)
+    @hook.stubs(:failures).returns(issues)
 
     sha = 'decafbad'
     @checkout.stubs(:sha).returns(sha)
@@ -166,29 +201,29 @@ class BoxenReporterTest < Boxen::Test
       api.expects(:close_issue).with(repo, issue.number)
     end
 
-    @reporter.close_failures
+    @hook.close_failures
   end
 
   def test_close_failures_no_issues
-    @reporter.stubs(:issues?).returns(false)
+    @hook.stubs(:issues?).returns(false)
 
-    @reporter.expects(:failures).never
+    @hook.expects(:failures).never
 
     @config.api = api = mock('api')
     api.expects(:add_comment).never
     api.expects(:close_issue).never
 
-    @reporter.close_failures
+    @hook.close_failures
   end
 
   def test_failures
-    @reporter.stubs(:issues?).returns(true)
+    @hook.stubs(:issues?).returns(true)
 
     @config.reponame = repo = 'some/repo'
     @config.login    = user = 'hapless'
 
-    @reporter.failure_label = fail_label = 'ouch'
-    @reporter.ongoing_label = goon_label = 'goon'
+    @hook.failure_label = fail_label = 'ouch'
+    @hook.ongoing_label = goon_label = 'goon'
 
     fail_l = Label.new(fail_label)
     goon_l = Label.new(goon_label)
@@ -205,16 +240,16 @@ class BoxenReporterTest < Boxen::Test
     @config.api = api = mock('api')
     api.expects(:list_issues).with(repo, :state => 'open', :labels => fail_label, :creator => user).returns(issues)
 
-    assert_equal issues.values_at(0,1,3), @reporter.failures
+    assert_equal issues.values_at(0,1,3), @hook.failures
   end
 
   def test_failures_no_issues
-    @reporter.stubs(:issues?).returns(false)
+    @hook.stubs(:issues?).returns(false)
 
     @config.api = api = mock('api')
     api.expects(:list_issues).never
 
-    assert_equal [], @reporter.failures
+    assert_equal [], @hook.failures
   end
 
   RepoInfo = Struct.new(:has_issues)
@@ -225,18 +260,18 @@ class BoxenReporterTest < Boxen::Test
 
     @config.api = api = mock('api')
     api.stubs(:repository).with(repo).returns(repo_info)
-    assert @reporter.issues?
+    assert @hook.issues?
 
     repo_info = RepoInfo.new(false)
     api.stubs(:repository).with(repo).returns(repo_info)
-    refute @reporter.issues?
+    refute @hook.issues?
 
     @config.stubs(:reponame)  # to ensure the returned value is nil
     api.stubs(:repository).returns(RepoInfo.new(true))
-    refute @reporter.issues?
+    refute @hook.issues?
 
     @config.stubs(:reponame).returns('boxen/our-boxen') # our main public repo
     api.stubs(:repository).returns(RepoInfo.new(true))
-    refute @reporter.issues?
+    refute @hook.issues?
   end
 end

data/test/boxen_hook_web_test.rb

@@ -0,0 +1,58 @@
+require "boxen/test"
+require "boxen/hook/web"
+
+class Boxen::Config
+  attr_writer :api
+end
+
+class BoxenHookWebTest < Boxen::Test
+  def setup
+    @config   = Boxen::Config.new
+    @checkout = Boxen::Checkout.new(@config)
+    @puppet   = mock 'puppeteer'
+    @result   = stub 'result', :success? => true
+    @hook = Boxen::Hook::Web.new @config, @checkout, @puppet, @result
+  end
+
+  def test_enabled
+    original = ENV['BOXEN_WEB_HOOK_URL']
+
+    ENV['BOXEN_WEB_HOOK_URL'] = nil
+    refute @hook.enabled?
+
+    ENV['BOXEN_WEB_HOOK_URL'] = ''
+    refute @hook.enabled?
+
+    ENV['BOXEN_WEB_HOOK_URL'] = '1'
+    assert @hook.enabled?
+
+    ENV['BOXEN_WEB_HOOK_URL'] = original
+  end
+
+  def test_perform
+    @hook.stubs(:enabled?).returns(false)
+    refute @hook.perform?
+
+    @hook.stubs(:enabled?).returns(true)
+    assert @hook.perform?
+  end
+
+  def test_run
+    @config.stubs(:user).returns('fred')
+    @checkout.stubs(:sha).returns('87dbag3')
+    @result.stubs(:success?).returns(false)
+    now = Time.now
+    Time.stubs(:now).returns(now)
+
+    @hook.stubs(:enabled?).returns(true)
+
+    @hook.expects(:post_web_hook).with({
+      :login  => 'fred',
+      :sha    => '87dbag3',
+      :status => 'failure',
+      :time   => "#{now.utc.to_i}"
+    })
+
+    @hook.run
+  end
+end

data/test/boxen_runner_test.rb

@@ -20,93 +20,24 @@ class BoxenRunnerTest < Boxen::Test
     assert_equal config, runner.config
     assert_equal flags,  runner.flags
     assert_equal config, runner.puppet.config
-
-    assert_equal config,          runner.reporter.config
-    assert_equal config,          runner.reporter.checkout.config
-    assert_equal runner.checkout, runner.reporter.checkout
-    assert_equal runner.puppet,   runner.reporter.puppet
-  end
-
-  def test_issues?
-    @config.stealth = true
-    @config.pretend = true
-    @runner.checkout.stubs(:master?).returns(false)
-    assert !@runner.issues?
-
-    @config.stealth = false
-    @config.pretend = true
-    @runner.checkout.stubs(:master?).returns(false)
-    assert !@runner.issues?
-
-    @config.stealth = true
-    @config.pretend = false
-    @runner.checkout.stubs(:master?).returns(false)
-    assert !@runner.issues?
-
-    @config.stealth = true
-    @config.pretend = true
-    @runner.checkout.stubs(:master?).returns(true)
-    assert !@runner.issues?
-
-    @config.stealth = false
-    @config.pretend = true
-    @runner.checkout.stubs(:master?).returns(true)
-    assert !@runner.issues?
-
-    @config.stealth = true
-    @config.pretend = false
-    @runner.checkout.stubs(:master?).returns(true)
-    assert !@runner.issues?
-
-    @config.stealth = false
-    @config.pretend = false
-    @runner.checkout.stubs(:master?).returns(true)
-    assert @runner.issues?
-  end
-
-  def test_report_failure
-    @runner.stubs(:issues?).returns(true)
-    status = stub('status', :success? => false)
-    @runner.stubs(:process).returns(status)
-    @runner.stubs(:warn)
-
-    @runner.reporter.expects(:record_failure)
-    @runner.reporter.expects(:close_failures).never
-
-    @runner.run
   end
 
-  def test_run_success
-    @runner.stubs(:issues?).returns(true)
-    status = stub('status', :success? => true)
-    @runner.stubs(:process).returns(status)
+  HookYes = Struct.new(:config, :checkout, :puppet, :result)
+  HookNo  = Struct.new(:config, :checkout, :puppet, :result)
+  def test_report
+    runner = Boxen::Runner.new(@config, @flags)
+    runner.stubs(:hooks).returns([HookYes, HookNo])
 
-    @runner.reporter.expects(:record_failure).never
-    @runner.reporter.expects(:close_failures)
-
-    @runner.run
-  end
-
-  def test_run_failure_no_issues
-    @runner.stubs(:issues?).returns(false)
-    status = stub('status', :success? => false)
-    @runner.stubs(:process).returns(status)
-
-    @runner.reporter.expects(:record_failure).never
-    @runner.reporter.expects(:close_failures).never
-
-    @runner.run
-  end
+    hook_yes = stub('HookYes')
+    hook_no  = stub('HookNo')
 
-  def test_run_success_no_issues
-    @runner.stubs(:issues?).returns(false)
-    status = stub('status', :success? => true)
-    @runner.stubs(:process).returns(status)
+    HookYes.stubs(:new).returns(hook_yes)
+    HookNo.stubs(:new).returns(hook_no)
 
-    @runner.reporter.expects(:record_failure).never
-    @runner.reporter.expects(:close_failures).never
+    hook_yes.expects(:run).once
+    hook_no.expects(:run).once
 
-    @runner.run
+    runner.report(stub('result'))
   end
 
   def test_disable_services
@@ -148,6 +79,7 @@ class BoxenRunnerTest < Boxen::Test
   end
 
   def test_specify_project
+    skip "busted and probably due to be replaced if @jbarnette can fix it"
     fact = 'cli_boxen_projects'
     refute Facter.value(fact)
 
@@ -155,6 +87,7 @@ class BoxenRunnerTest < Boxen::Test
     flags   = Boxen::Flags.new(project)
 
     runner = Boxen::Runner.new(@config, flags)
+    runner.puppet.expects(:run).with().returns(true)
     runner.process
     assert_equal project, Facter.value(fact)
 
@@ -163,6 +96,7 @@ class BoxenRunnerTest < Boxen::Test
     flags   = Boxen::Flags.new('--debug', project)
 
     runner = Boxen::Runner.new(@config, flags)
+    runner.puppet.expects(:run).with().returns(true)
     runner.process
     assert_equal project, Facter.value(fact)
 
@@ -171,6 +105,7 @@ class BoxenRunnerTest < Boxen::Test
     flags    = Boxen::Flags.new('--noop', *projects)
 
     runner = Boxen::Runner.new(@config, flags)
+    runner.puppet.expects(:run).with().returns(true)
     runner.process
     assert_equal projects.join(','), Facter.value(fact)
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 0
-  version: 0.6.0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-21 00:00:00 -08:00
+date: 2013-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,10 +118,10 @@ dependencies:
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
-        - 5
+        - 4
+        - 4
         - 0
-        version: 3.5.0
+        version: 4.4.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -133,8 +133,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 12
-        version: "0.12"
+        - 13
+        version: "0.13"
   type: :development
   version_requirements: *id009
 description: Manage Mac development boxes with love (and Puppet).
@@ -160,11 +160,15 @@ files:
 - lib/boxen/config.rb
 - lib/boxen/error.rb
 - lib/boxen/flags.rb
+- lib/boxen/hook.rb
+- lib/boxen/hook/github_issue.rb
+- lib/boxen/hook/web.rb
 - lib/boxen/postflight.rb
 - lib/boxen/postflight/active.rb
 - lib/boxen/postflight/env.rb
 - lib/boxen/preflight.rb
 - lib/boxen/preflight/creds.rb
+- lib/boxen/preflight/directories.rb
 - lib/boxen/preflight/etc_my_cnf.rb
 - lib/boxen/preflight/homebrew.rb
 - lib/boxen/preflight/identity.rb
@@ -173,23 +177,23 @@ files:
 - lib/boxen/preflight/rvm.rb
 - lib/boxen/project.rb
 - lib/boxen/puppeteer.rb
-- lib/boxen/reporter.rb
 - lib/boxen/runner.rb
 - lib/boxen/service.rb
 - lib/boxen/util.rb
 - lib/facter/boxen.rb
-- lib/facter/dot_boxen.rb
 - lib/system_timer.rb
 - script/bootstrap
 - script/release
-- script/sync-puppet
 - script/tests
 - test/boxen/test.rb
 - test/boxen_check_test.rb
 - test/boxen_checkout_test.rb
 - test/boxen_cli_test.rb
 - test/boxen_config_test.rb
+- test/boxen_directories_test.rb
 - test/boxen_flags_test.rb
+- test/boxen_hook_github_issue_test.rb
+- test/boxen_hook_web_test.rb
 - test/boxen_postflight_active_test.rb
 - test/boxen_postflight_env_test.rb
 - test/boxen_preflight_etc_my_cnf_test.rb
@@ -197,7 +201,6 @@ files:
 - test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
 - test/boxen_puppeteer_test.rb
-- test/boxen_reporter_test.rb
 - test/boxen_runner_test.rb
 - test/boxen_service_test.rb
 - test/boxen_util_test.rb
@@ -240,7 +243,10 @@ test_files:
 - test/boxen_checkout_test.rb
 - test/boxen_cli_test.rb
 - test/boxen_config_test.rb
+- test/boxen_directories_test.rb
 - test/boxen_flags_test.rb
+- test/boxen_hook_github_issue_test.rb
+- test/boxen_hook_web_test.rb
 - test/boxen_postflight_active_test.rb
 - test/boxen_postflight_env_test.rb
 - test/boxen_preflight_etc_my_cnf_test.rb
@@ -248,7 +254,6 @@ test_files:
 - test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
 - test/boxen_puppeteer_test.rb
-- test/boxen_reporter_test.rb
 - test/boxen_runner_test.rb
 - test/boxen_service_test.rb
 - test/boxen_util_test.rb

data/lib/boxen/reporter.rb

@@ -1,103 +0,0 @@
-module Boxen
-  class Reporter
-    attr_reader :config
-    attr_reader :checkout
-    attr_reader :puppet
-
-    def initialize(config, checkout, puppet)
-      @config   = config
-      @checkout = checkout
-      @puppet   = puppet
-    end
-
-    def compare_url
-      return unless config.reponame
-      "https://github.com/#{config.reponame}/compare/#{checkout.sha}...master"
-    end
-
-    def hostname
-      `hostname`.strip
-    end
-
-    def os
-      `sw_vers -productVersion`.strip
-    end
-
-    def shell
-      ENV["SHELL"]
-    end
-
-    def log
-      File.read config.logfile
-    end
-
-    def record_failure
-      return unless issues?
-
-      title = "Failed for #{config.user}"
-      config.api.create_issue(config.reponame, title, failure_details,
-        :labels => [failure_label])
-    end
-
-    def close_failures
-      return unless issues?
-
-      comment = "Succeeded at version #{checkout.sha}."
-      failures.each do |issue|
-        config.api.add_comment(config.reponame, issue.number, comment)
-        config.api.close_issue(config.reponame, issue.number)
-      end
-    end
-
-    def failures
-      return [] unless issues?
-
-      issues = config.api.list_issues(config.reponame, :state => 'open',
-        :labels => failure_label, :creator => config.login)
-      issues.reject! {|i| i.labels.collect(&:name).include?(ongoing_label)}
-      issues
-    end
-
-    def failure_details
-      body = ''
-      body << "Running on `#{hostname}` (OS X #{os}) under `#{shell}`, "
-      body << "version #{checkout.sha} ([compare to master](#{compare_url}))."
-      body << "\n\n"
-
-      if checkout.dirty?
-        body << "### Changes"
-        body << "\n\n"
-        body << "```\n#{checkout.changes}\n```"
-        body << "\n\n"
-      end 
-
-      body << "### Puppet Command"
-      body << "\n\n"
-      body << "```\n#{puppet.command.join(' ')}\n```"
-      body << "\n\n"
-
-      body << "### Output (from #{config.logfile})"
-      body << "\n\n"
-      body << "```\n#{log}\n```\n"
-
-      body
-    end
-
-    def failure_label
-      @failure_label ||= 'failure'
-    end
-    attr_writer :failure_label
-
-    def ongoing_label
-      @ongoing_label ||= 'ongoing'
-    end
-    attr_writer :ongoing_label
-
-    def issues?
-      return unless config.reponame
-      return if config.reponame == 'boxen/our-boxen'
-
-      config.api.repository(config.reponame).has_issues
-    end
-  end
-end

data/lib/facter/dot_boxen.rb

@@ -1,8 +0,0 @@
-require "json"
-
-dot_boxen = "#{ENV['HOME']}/.boxen"
-
-if File.exist? dot_boxen
-  facts = JSON.parse(File.read(dot_boxen))
-  facts.each { |k, v| Facter.add(k) { setcode { v } } }
-end

data/script/sync-puppet

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-# Make sure all boxen/puppet-* repos are cloned under ./puppet.
-
-require "fileutils"
-require "pathname"
-
-# Put us where we belong, in the root dir of boxen.
-
-Dir.chdir Pathname.new(__FILE__).realpath + "../.."
-
-# Load the local env in case creds are set there.
-
-load ".env.local.rb" if File.file? ".env.local.rb"
-
-# Make sure we're up to date.
-
-abort "Bootstrap failed." unless system "script/bootstrap"
-
-require "rubygems"
-require "bundler/setup"
-require "octokit"
-
-unless ENV["GITHUB_LOGIN"] && ENV["GITHUB_PASSWORD"]
-  abort "Please set the GITHUB_LOGIN and GITHUB_PASSWORD env vars."
-end
-
-api = Octokit::Client.new \
-  :login => ENV["GITHUB_LOGIN"], :password => ENV["GITHUB_PASSWORD"]
-
-# Gotta have a ./puppet dir.
-
-FileUtils.mkdir_p "puppet"
-
-# Clone boxen/puppet-* unless we have it already.
-
-api.organization_repositories("boxen").each do |repo|
-  next unless /^puppet-/ =~ repo.name
-
-  dest = "puppet/" + repo.name[7..-1]
-
-  unless File.directory? dest
-    system "git", "clone", repo.clone_url, dest
-  end
-end