boxen 0.4.1 → 0.4.2

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "0.4.1"
+  gem.version       = "0.4.2"
   gem.authors       = ["John Barnette", "Will Farrington"]
   gem.email         = ["jbarnette@github.com", "wfarr@github.com"]
   gem.description   = "Manage Mac development boxes with love (and Puppet)."

data/lib/boxen/cli.rb

@@ -1,103 +1,29 @@
-require "boxen/checkout"
 require "boxen/config"
 require "boxen/flags"
 require "boxen/postflight"
 require "boxen/preflight"
-require "boxen/puppeteer"
-require "boxen/reporter"
+require "boxen/runner"
 require "boxen/util"
 
 module Boxen
   class CLI
     attr_reader :config
     attr_reader :flags
-    attr_reader :puppet
-    attr_reader :checkout
-    attr_reader :reporter
+    attr_reader :runner
 
     def initialize(config, flags)
       @config = config
       @flags  = flags
-      @puppet = Boxen::Puppeteer.new @config
-      @checkout = Boxen::Checkout.new(@config)
-      @reporter = Boxen::Reporter.new(@config, @checkout, @puppet)
-    end
-
-    def process
-      # --env prints out the current BOXEN_ env vars.
-
-      exec "env | grep ^BOXEN_ | sort" if flags.env?
-
-      # --help prints some CLI help and exits.
-
-      abort "#{flags}\n" if flags.help?
-
-      # --projects prints a list of available projects and exits.
-
-      if flags.projects?
-        config.projects.each do |project|
-          prefix = project.installed? ? "*" : " "
-          puts "#{prefix} #{project.name}"
-        end
-
-        exit
-      end
-
-      # --disable-services stops all services
-
-      if flags.disable_services?
-        Dir["/Library/LaunchDaemons/com.boxen.*.plist"]. each do |service|
-          service_human_name = service.match(/com\.boxen\.(.+)\.plist$/)[1]
-          puts "Disabling #{service_human_name}..."
-          Boxen::Util.sudo("/bin/launchctl", "unload", "-w", service)
-        end
-
-        exit
-      end
-
-      # --enable-services starts all services
-
-      if flags.enable_services?
-        Dir["/Library/LaunchDaemons/com.boxen.*.plist"]. each do |service|
-          service_human_name = service.match(/com\.boxen\.(.+)\.plist$/)[1]
-          puts "Enabling #{service_human_name}..."
-          Boxen::Util.sudo("/bin/launchctl", "load", "-w", service)
-        end
-
-        exit
-      end
-
-      # --list-services lists all services
-
-      if flags.list_services?
-        Dir["/Library/LaunchDaemons/com.boxen.*.plist"]. each do |service|
-          service_human_name = service.match(/com\.boxen\.(.+)\.plist$/)[1]
-          puts service_human_name
-        end
-
-        exit
-      end
-
-      # Actually run Puppet and return its exit code.
-
-      puppet.run
+      @runner = Boxen::Runner.new(@config, @flags)
     end
 
     def run
-      report(process)
-    end
-
-    def report(result)
-      return result unless issues?
-
-      if self.class.successful_exit_code? result
-        reporter.close_failures
-      else
-        warn "Sorry! Creating an issue on #{config.reponame}."
-        reporter.record_failure
+      if flags.help?
+        puts flags
+        exit
       end
 
-      result
+      runner.run
     end
 
     # Run Boxen by wiring together the command-line flags, config,
@@ -132,23 +58,11 @@ module Boxen
 
       # Run the postflight checks.
 
-      Boxen::Postflight.run config if successful_exit_code?(status)
+      Boxen::Postflight.run config if status.success?
 
       # Return Puppet's exit status.
 
-      return status
-    end
-
-    # Puppet's detailed exit codes reserves 2 for a successful run with changes
-
-    def self.successful_exit_code?(code)
-      [0, 2].member? code
-    end
-
-    # Should the result of this run have any effect on GitHub issues?
-
-    def issues?
-      !config.stealth? && !config.pretend? && checkout.master?
+      return status.code
     end
   end
 end

data/lib/boxen/puppeteer.rb

@@ -6,6 +6,14 @@ module Boxen
   # Manages an invocation of puppet.
 
   class Puppeteer
+
+    class Status < Struct.new(:code)
+      # Puppet's detailed exit codes reserves 2 for a successful run with changes
+      def success?
+        [0,2].include?(code)
+      end
+    end
+
     attr_reader :config
 
     def initialize(config)
@@ -77,7 +85,7 @@ module Boxen
       warn command.join " " if config.debug?
       Boxen::Util.sudo *command
 
-      $?.exitstatus
+      Status.new($?.exitstatus)
     end
   end
 end

data/lib/boxen/runner.rb

@@ -0,0 +1,117 @@
+require "boxen/checkout"
+require "boxen/config"
+require "boxen/flags"
+require "boxen/puppeteer"
+require "boxen/reporter"
+require "boxen/util"
+
+module Boxen
+  class Runner
+    attr_reader :config
+    attr_reader :flags
+    attr_reader :puppet
+    attr_reader :checkout
+    attr_reader :reporter
+
+    def initialize(config, flags)
+      @config = config
+      @flags  = flags
+      @puppet   = Boxen::Puppeteer.new(@config)
+      @checkout = Boxen::Checkout.new(@config)
+      @reporter = Boxen::Reporter.new(@config, @checkout, @puppet)
+    end
+
+    def process
+      # --env prints out the current BOXEN_ env vars.
+
+      exec "env | grep ^BOXEN_ | sort" if flags.env?
+
+      process_flags
+
+      # Actually run Puppet and return its result
+
+      puppet.run
+    end
+
+    def run
+      report(process)
+    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
+
+      result
+    end
+
+    def process_flags
+
+      # --projects prints a list of available projects and exits.
+
+      if flags.projects?
+        config.projects.each do |project|
+          prefix = project.installed? ? "*" : " "
+          puts "#{prefix} #{project.name}"
+        end
+
+        exit
+      end
+
+      # --disable-services stops all services
+
+      if flags.disable_services?
+        Boxen::Service.list.each do |service|
+          puts "Disabling #{service}..."
+          service.disable
+        end
+
+        exit
+      end
+
+      # --enable-services starts all services
+
+      if flags.enable_services?
+        Boxen::Service.list.each do |service|
+          puts "Enabling #{service}..."
+          service.enable
+        end
+
+        exit
+      end
+
+      # --list-services lists all services
+
+      if flags.list_services?
+        Boxen::Service.list.each do |service|
+          puts service
+        end
+
+        exit
+      end
+
+    end
+
+    # Should the result of this run have any effect on GitHub issues?
+
+    def issues?
+      !config.stealth? && !config.pretend? && checkout.master?
+    end
+
+
+    private
+
+    def services
+      Dir["/Library/LaunchDaemons/com.boxen.*.plist"]
+    end
+
+    def service_human_name(service)
+      service.match(/com\.boxen\.(.+)\.plist$/)[1]
+    end
+  end
+end

data/lib/boxen/service.rb

@@ -0,0 +1,48 @@
+require "boxen/util"
+
+module Boxen
+  class Service
+    attr_reader :name
+
+    def self.list
+      files.collect do |service|
+        new(human_name(service))
+      end
+    end
+
+    def initialize(name)
+      @name = name
+    end
+
+    def to_s
+      name
+    end
+
+    def enable
+      Boxen::Util.sudo('/bin/launchctl', 'load', '-w', location)
+    end
+
+    def disable
+      Boxen::Util.sudo('/bin/launchctl', 'unload', '-w', location)
+    end
+
+
+    private
+
+    def location
+      "#{self.class.location}/com.boxen.#{name}.plist"
+    end
+
+    def self.location
+      "/Library/LaunchDaemons"
+    end
+
+    def self.files
+      Dir["#{location}/com.boxen.*.plist"]
+    end
+
+    def self.human_name(service)
+      service.match(/com\.boxen\.(.+)\.plist$/)[1]
+    end
+  end
+end

data/lib/facter/dot_boxen.rb

@@ -0,0 +1,8 @@
+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/test/boxen_cli_test.rb

@@ -5,10 +5,7 @@ class BoxenCLITest < Boxen::Test
   def setup
     @config = Boxen::Config.new
     @flags  = Boxen::Flags.new
-    @cli = Boxen::CLI.new(@config, @flags)
-
-    $stdout.stubs(:puts).returns(true)
-    $stdout.stubs(:write).returns(true)
+    @cli    = Boxen::CLI.new(@config, @flags)
   end
 
   def test_initialize
@@ -18,166 +15,25 @@ class BoxenCLITest < Boxen::Test
     cli = Boxen::CLI.new config, flags
 
     assert_equal config, cli.config
-    assert_equal flags, cli.flags
-    assert_equal config, cli.puppet.config
-
-    assert_equal config, cli.reporter.config
-    assert_equal config, cli.reporter.checkout.config
-    assert_equal cli.checkout, cli.reporter.checkout
-    assert_equal cli.puppet, cli.reporter.puppet
-  end
-
-  def test_issues?
-    @config.stealth = true
-    @config.pretend = true
-    @cli.checkout.stubs(:master?).returns(false)
-    assert !@cli.issues?
-
-    @config.stealth = false
-    @config.pretend = true
-    @cli.checkout.stubs(:master?).returns(false)
-    assert !@cli.issues?
-
-    @config.stealth = true
-    @config.pretend = false
-    @cli.checkout.stubs(:master?).returns(false)
-    assert !@cli.issues?
-
-    @config.stealth = true
-    @config.pretend = true
-    @cli.checkout.stubs(:master?).returns(true)
-    assert !@cli.issues?
-
-    @config.stealth = false
-    @config.pretend = true
-    @cli.checkout.stubs(:master?).returns(true)
-    assert !@cli.issues?
-
-    @config.stealth = true
-    @config.pretend = false
-    @cli.checkout.stubs(:master?).returns(true)
-    assert !@cli.issues?
-
-    @config.stealth = false
-    @config.pretend = false
-    @cli.checkout.stubs(:master?).returns(true)
-    assert @cli.issues?
-  end
-
-  def test_report_failure
-    @cli.stubs(:issues?).returns(true)
-    @cli.stubs(:process).returns(1)
-    @cli.stubs(:warn)
-
-    @cli.reporter.expects(:record_failure)
-    @cli.reporter.expects(:close_failures).never
-
-    @cli.run
-  end
-
-  def test_run_success
-    @cli.stubs(:issues?).returns(true)
-    @cli.stubs(:process).returns(0)
-
-    @cli.reporter.expects(:record_failure).never
-    @cli.reporter.expects(:close_failures)
-
-    @cli.run
-  end
-
-  def test_run_success_exit_code_2
-    @cli.stubs(:issues?).returns(true)
-    @cli.stubs(:process).returns(2)
-
-    @cli.reporter.expects(:record_failure).never
-    @cli.reporter.expects(:close_failures)
-
-    @cli.run
-  end
+    assert_equal flags,  cli.flags
 
-  def test_run_failure_no_issues
-    @cli.stubs(:issues?).returns(false)
-    @cli.stubs(:process).returns(1)
-
-    @cli.reporter.expects(:record_failure).never
-    @cli.reporter.expects(:close_failures).never
-
-    @cli.run
+    assert_equal config, cli.runner.config
+    assert_equal flags,  cli.runner.flags
   end
 
-  def test_run_success_no_issues
-    @cli.stubs(:issues?).returns(false)
-    @cli.stubs(:process).returns(0)
-
-    @cli.reporter.expects(:record_failure).never
-    @cli.reporter.expects(:close_failures).never
-
+  def test_run
+    @cli.runner.expects(:run)
     @cli.run
   end
 
-  def test_run_success_exit_code_2_no_issues
-    @cli.stubs(:issues?).returns(false)
-    @cli.stubs(:process).returns(2)
-
-    @cli.reporter.expects(:record_failure).never
-    @cli.reporter.expects(:close_failures).never
-
-    @cli.run
-  end
-
-  def test_disable_services
-    config = Boxen::Config.new
-    flags  = Boxen::Flags.new('--disable-services')
-    cli    = Boxen::CLI.new config, flags
-
-    Dir.expects(:[]).with("/Library/LaunchDaemons/com.boxen.*.plist").returns([
-      "/Library/LaunchDaemons/com.boxen.test.plist"
-    ])
-
-    Boxen::Util.expects(:sudo).with(
-      "/bin/launchctl",
-      "unload",
-      "-w",
-      "/Library/LaunchDaemons/com.boxen.test.plist"
-    ).returns(true)
-
-    assert_raises(SystemExit) do
-      cli.process
-    end
-  end
-
-  def test_enable_services
-    config = Boxen::Config.new
-    flags  = Boxen::Flags.new('--enable-services')
-    cli    = Boxen::CLI.new config, flags
-
-    Dir.expects(:[]).with("/Library/LaunchDaemons/com.boxen.*.plist").returns([
-      "/Library/LaunchDaemons/com.boxen.test.plist"
-    ])
-
-    Boxen::Util.expects(:sudo).with(
-      "/bin/launchctl",
-      "load",
-      "-w",
-      "/Library/LaunchDaemons/com.boxen.test.plist"
-    ).returns(true)
-
-    assert_raises(SystemExit) do
-      cli.process
-    end
-  end
-
-  def test_list_services
-    config = Boxen::Config.new
-    flags  = Boxen::Flags.new('--list-services')
-    cli    = Boxen::CLI.new config, flags
-
-    Dir.expects(:[]).with("/Library/LaunchDaemons/com.boxen.*.plist").returns([
-      "/Library/LaunchDaemons/com.boxen.test.plist"
-    ])
+  def test_help
+    $stdout.stubs(:write)
 
-    assert_raises(SystemExit) do
-      cli.process
+    flags = Boxen::Flags.new('--help')
+    cli   = Boxen::CLI.new(@config, flags)
+    cli.runner.expects(:run).never
+    assert_raises SystemExit do
+      cli.run
     end
   end
 end

data/test/boxen_puppeteer_test.rb

@@ -75,4 +75,15 @@ class BoxenPuppeteerTest < Boxen::Test
 
     assert found, "Flags must include #{flag} #{value}."
   end
+
+  def test_status
+    status = Boxen::Puppeteer::Status.new(0)
+    assert status.success?
+
+    status = Boxen::Puppeteer::Status.new(2)
+    assert status.success?
+
+    status = Boxen::Puppeteer::Status.new(1)
+    refute status.success?
+  end
 end

data/test/boxen_runner_test.rb

@@ -0,0 +1,149 @@
+require "boxen/test"
+require "boxen/runner"
+
+class BoxenRunnerTest < Boxen::Test
+  def setup
+    @config = Boxen::Config.new
+    @flags  = Boxen::Flags.new
+    @runner = Boxen::Runner.new(@config, @flags)
+
+    $stdout.stubs(:puts).returns(true)
+    $stdout.stubs(:write).returns(true)
+  end
+
+  def test_initialize
+    config = Boxen::Config.new
+    flags  = Boxen::Flags.new
+
+    runner = Boxen::Runner.new(config, flags)
+
+    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)
+
+    @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
+
+  def test_run_success_no_issues
+    @runner.stubs(:issues?).returns(false)
+    status = stub('status', :success? => true)
+    @runner.stubs(:process).returns(status)
+
+    @runner.reporter.expects(:record_failure).never
+    @runner.reporter.expects(:close_failures).never
+
+    @runner.run
+  end
+
+  def test_disable_services
+    config = Boxen::Config.new
+    flags  = Boxen::Flags.new('--disable-services')
+    runner = Boxen::Runner.new config, flags
+
+    services = Array.new(3) { mock('service', :disable => true) }
+    Boxen::Service.stubs(:list).returns(services)
+
+    assert_raises(SystemExit) do
+      runner.process
+    end
+  end
+
+  def test_enable_services
+    config = Boxen::Config.new
+    flags  = Boxen::Flags.new('--enable-services')
+    runner = Boxen::Runner.new config, flags
+
+    services = Array.new(3) { mock('service', :enable => true) }
+    Boxen::Service.stubs(:list).returns(services)
+
+    assert_raises(SystemExit) do
+      runner.process
+    end
+  end
+
+  def test_list_services
+    config = Boxen::Config.new
+    flags  = Boxen::Flags.new('--list-services')
+    runner = Boxen::Runner.new config, flags
+
+    Boxen::Service.expects(:list).returns(%w[a list of services])
+
+    assert_raises(SystemExit) do
+      runner.process
+    end
+  end
+end

data/test/boxen_service_test.rb

@@ -0,0 +1,33 @@
+require "boxen/test"
+require "boxen/service"
+
+class BoxenServiceTest < Boxen::Test
+  def test_list
+    Dir.expects(:[]).with("/Library/LaunchDaemons/com.boxen.*.plist").returns([
+      "/Library/LaunchDaemons/com.boxen.test.plist",
+      "/Library/LaunchDaemons/com.boxen.other.plist"
+    ])
+
+    services = Boxen::Service.list
+    assert_equal ['other', 'test'], services.collect(&:name).sort
+  end
+
+  def test_enable
+    service = Boxen::Service.new('blip')
+    Boxen::Util.expects(:sudo).with('/bin/launchctl', 'load', '-w',
+      '/Library/LaunchDaemons/com.boxen.blip.plist')
+    service.enable
+  end
+
+  def test_disable
+    service = Boxen::Service.new('thing')
+    Boxen::Util.expects(:sudo).with('/bin/launchctl', 'unload', '-w',
+      '/Library/LaunchDaemons/com.boxen.thing.plist')
+    service.disable
+  end
+
+  def test_to_s
+    service = Boxen::Service.new('blam')
+    assert_equal service.name, service.to_s
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxen
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - John Barnette
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 -10:00
+date: 2012-10-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,8 +193,11 @@ files:
 - 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
@@ -214,6 +217,8 @@ files:
 - 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
 - test/fixtures/repo/modules/projects/manifests/first-project.pp
 - test/fixtures/repo/modules/projects/manifests/second-project.pp
@@ -267,6 +272,8 @@ test_files:
 - 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
 - test/fixtures/repo/modules/projects/manifests/first-project.pp
 - test/fixtures/repo/modules/projects/manifests/second-project.pp