boxen 2.9.0 → 3.0.0.beta1

data/test/{boxen_hook_web_test.rb → postflight/boxen_postflight_web_hook_test.rb}

@@ -1,17 +1,18 @@
-require "boxen/test"
-require "boxen/hook/web"
+require 'boxen/test'
+require 'boxen/postflight'
+require 'boxen/postflight/web_hook'
 
 class Boxen::Config
   attr_writer :api
 end
 
-class BoxenHookWebTest < Boxen::Test
+class BoxenPostflightWebHookTest < 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
+    @command  = stub 'command', :success? => true
+    @hook = Boxen::Postflight::WebHook.new @config, @command
+    @hook.checkout = @checkout
   end
 
   def test_enabled
@@ -29,18 +30,18 @@ class BoxenHookWebTest < Boxen::Test
     ENV['BOXEN_WEB_HOOK_URL'] = original
   end
 
-  def test_perform
+  def test_ok
     @hook.stubs(:enabled?).returns(false)
-    refute @hook.perform?
+    assert @hook.ok?
 
     @hook.stubs(:enabled?).returns(true)
-    assert @hook.perform?
+    refute @hook.ok?
   end
 
   def test_run
     @config.stubs(:user).returns('fred')
     @checkout.stubs(:sha).returns('87dbag3')
-    @result.stubs(:success?).returns(false)
+    @command.stubs(:success?).returns(false)
     now = Time.now
     Time.stubs(:now).returns(now)
 
@@ -55,4 +56,4 @@ class BoxenHookWebTest < Boxen::Test
 
     @hook.run
   end
-end
+end

data/test/preflight/boxen_preflight_creds_test.rb

@@ -0,0 +1,82 @@
+require 'boxen/test'
+require 'boxen/config'
+require 'boxen/preflight/creds'
+
+class BoxenPreflightCredsTest < Boxen::Test
+  def setup
+    @config   = Boxen::Config.new do |c|
+      c.user  = 'mojombo'
+      c.token = 'sekr3t!'
+    end
+    @command = stub 'command'
+    ENV.delete("BOXEN_GITHUB_LOGIN")
+    ENV.delete("BOXEN_GITHUB_PASSWORD")
+  end
+
+  def test_basic
+    preflight = Boxen::Preflight::Creds.new @config, @command
+
+    error = Octokit::Unauthorized.new
+    @config.api.stubs(:user).returns(error)
+    @config.stubs(:offline?).returns(false)
+
+    refute preflight.ok?
+  end
+
+  def test_basic_with_otp_challenge
+    preflight = Boxen::Preflight::Creds.new @config, @command
+
+    blank_opt = {:headers => {}}
+    good_otp  = {:headers => {"X-GitHub-OTP" => "123456"}}
+
+    error = Octokit::OneTimePasswordRequired.new
+    error.stubs(:message).returns("OTP")
+
+    preflight.tmp_api.expects(:authorizations).with(blank_opt).raises(error)
+    preflight.tmp_api.expects(:authorizations).with(good_otp).returns([])
+    preflight.tmp_api.expects(:create_authorization).raises(error)
+
+    preflight.expects(:warn)
+    HighLine.any_instance.expects(:ask).returns("123456")
+
+    preflight.get_tokens
+    assert_equal "123456", preflight.otp
+  end
+
+  def test_fetch_login_and_password_when_nothing_is_given_in_env
+    # fetches login and password by asking
+    preflight = Boxen::Preflight::Creds.new @config, @command
+    HighLine.any_instance.expects(:ask).with("GitHub login: ").returns "l"
+    HighLine.any_instance.expects(:ask).with("GitHub password: ").returns "p"
+    preflight.send(:fetch_login_and_password)
+
+    assert_equal "l", @config.login
+    assert_equal "p", preflight.instance_variable_get(:@password)
+  end
+
+  def test_fetch_password_when_login_is_given_in_env
+    # fetches only password by asking
+    ENV["BOXEN_GITHUB_LOGIN"] = "l"
+    preflight = Boxen::Preflight::Creds.new @config, @command
+    preflight.expects(:warn)
+    HighLine.any_instance.expects(:ask).with("GitHub login: ").never
+    HighLine.any_instance.expects(:ask).with("GitHub password: ").returns "p"
+    preflight.send(:fetch_login_and_password)
+
+    assert_equal "l", @config.login
+    assert_equal "p", preflight.instance_variable_get(:@password)
+  end
+
+  def test_fetch_login_when_password_is_given_in_env
+    # fetches only login by asking
+    ENV["BOXEN_GITHUB_PASSWORD"] = "p"
+    preflight = Boxen::Preflight::Creds.new @config, @command
+    preflight.expects(:warn)
+    HighLine.any_instance.expects(:ask).with("GitHub login: ").returns "l"
+    HighLine.any_instance.expects(:ask).with("GitHub password: ").never
+    preflight.send(:fetch_login_and_password)
+
+    assert_equal "l", @config.login
+    assert_equal "p", preflight.instance_variable_get(:@password)
+  end
+end

data/test/{boxen_preflight_etc_my_cnf_test.rb → preflight/boxen_preflight_etc_my_cnf_test.rb}

@@ -3,7 +3,7 @@ require 'boxen/preflight/etc_my_cnf'
 
 class BoxenPreflightEtcMyCnfTest < Boxen::Test
   def test_file_check
-    preflight = Boxen::Preflight::EtcMyCnf.new(mock('config'))
+    preflight = Boxen::Preflight::EtcMyCnf.new(mock('config'), mock('command'))
     File.expects(:file?).with("/etc/my.cnf").returns(false)
     assert preflight.ok?
   end

data/test/preflight/boxen_preflight_homebrew_test.rb

@@ -0,0 +1,10 @@
+require 'boxen/test'
+require 'boxen/preflight/homebrew'
+
+class BoxenPreflightHomebrewTest < Boxen::Test
+  def test_directory_check
+    preflight = Boxen::Preflight::Homebrew.new(mock('config'), mock('command'))
+    File.expects(:exist?).with("/usr/local/Library/Homebrew").returns(false)
+    assert preflight.ok?
+  end
+end

data/test/{boxen_preflight_rvm_test.rb → preflight/boxen_preflight_rvm_test.rb}

@@ -3,7 +3,7 @@ require 'boxen/preflight/rvm'
 
 class BoxenPreflightRVMTest < Boxen::Test
   def test_directory_check
-    preflight = Boxen::Preflight::RVM.new(mock('config'))
+    preflight = Boxen::Preflight::RVM.new(mock('config'), mock('command'))
     File.expects(:exist?).with("#{ENV['HOME']}/.rvm").returns(false)
     assert preflight.ok?
   end

metadata

@@ -1,192 +1,240 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: boxen
-version: !ruby/object:Gem::Version
-  version: 2.9.0
+version: !ruby/object:Gem::Version 
+  hash: -597667722
+  prerelease: 6
+  segments: 
+  - 3
+  - 0
+  - 0
+  - beta
+  - 1
+  version: 3.0.0.beta1
 platform: ruby
-authors:
-- Jacob Bednarz
+authors: 
+- John Barnette
+- Will Farrington
+- David Goodlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-07-30 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ansi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hiera
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hiera
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 7
+        - 7
         version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: librarian-puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: librarian-puppet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.1
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: octokit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 7
+        - 1
         version: 2.7.1
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: puppet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 5
+        - 0
+        version: "5.0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 13
+        version: "0.13"
+  type: :development
+  version_requirements: *id009
 description: Manage Mac development boxes with love (and Puppet).
-email:
-- jacob.bednarz@gmail.com
-executables: []
+email: 
+- jbarnette@github.com
+- wfarr@github.com
+- dgoodlad@github.com
+executables: 
+- boxen
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
+- bin/boxen
 - boxen.gemspec
 - lib/boxen/check.rb
 - lib/boxen/checkout.rb
 - lib/boxen/cli.rb
+- lib/boxen/command.rb
+- lib/boxen/command/help.rb
+- lib/boxen/command/preflight.rb
+- lib/boxen/command/project.rb
+- lib/boxen/command/project/install.rb
+- lib/boxen/command/run.rb
+- lib/boxen/command/service.rb
+- lib/boxen/command/service/disable.rb
+- lib/boxen/command/service/enable.rb
+- lib/boxen/command/service/restart.rb
+- lib/boxen/command/version.rb
+- lib/boxen/command_status.rb
 - 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/keychain.rb
 - lib/boxen/postflight.rb
 - lib/boxen/postflight/active.rb
 - lib/boxen/postflight/env.rb
+- lib/boxen/postflight/github_issue.rb
+- lib/boxen/postflight/hooks.rb
+- lib/boxen/postflight/web_hook.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/facts.rb
+- lib/boxen/preflight/homebrew.rb
 - lib/boxen/preflight/identity.rb
+- lib/boxen/preflight/offline.rb
 - lib/boxen/preflight/os.rb
 - lib/boxen/preflight/rbenv.rb
 - lib/boxen/preflight/rvm.rb
+- lib/boxen/preflight/update.rb
 - lib/boxen/project.rb
-- lib/boxen/puppeteer.rb
-- lib/boxen/runner.rb
 - lib/boxen/service.rb
 - lib/boxen/util.rb
+- lib/boxen/util/logging.rb
+- lib/boxen/version.rb
 - lib/facter/boxen.rb
 - lib/system_timer.rb
 - script/Boxen
@@ -196,73 +244,101 @@ files:
 - script/tests
 - src/keychain-helper.c
 - test/boxen/test.rb
-- test/boxen_check_test.rb
 - test/boxen_checkout_test.rb
 - test/boxen_cli_test.rb
+- test/boxen_command_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_hook_test.rb
 - test/boxen_keychain_test.rb
-- test/boxen_postflight_active_test.rb
-- test/boxen_postflight_env_test.rb
-- test/boxen_preflight_creds_test.rb
-- test/boxen_preflight_etc_my_cnf_test.rb
-- test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
-- test/boxen_puppeteer_test.rb
-- test/boxen_runner_test.rb
 - test/boxen_service_test.rb
 - test/boxen_util_test.rb
+- test/command/help_test.rb
+- test/command/project/install_test.rb
+- test/command/project_test.rb
+- test/command/run_test.rb
+- test/command/service/disable_test.rb
+- test/command/service/enable_test.rb
+- test/command/service/restart_test.rb
+- test/command/service_test.rb
+- test/command/version_test.rb
 - test/fixtures/repo/modules/projects/manifests/first-project.pp
 - test/fixtures/repo/modules/projects/manifests/second-project.pp
+- test/postflight/boxen_postflight_active_test.rb
+- test/postflight/boxen_postflight_env_test.rb
+- test/postflight/boxen_postflight_github_issue_test.rb
+- test/postflight/boxen_postflight_web_hook_test.rb
+- test/preflight/boxen_preflight_creds_test.rb
+- test/preflight/boxen_preflight_etc_my_cnf_test.rb
+- test/preflight/boxen_preflight_homebrew_test.rb
+- test/preflight/boxen_preflight_rvm_test.rb
 - test/system_timer.rb
+has_rdoc: true
 homepage: https://github.com/boxen/boxen
-licenses:
-- MIT
-metadata: {}
+licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: You know, for laptops and stuff.
-test_files:
+test_files: 
 - test/boxen/test.rb
-- test/boxen_check_test.rb
 - test/boxen_checkout_test.rb
 - test/boxen_cli_test.rb
+- test/boxen_command_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_hook_test.rb
 - test/boxen_keychain_test.rb
-- test/boxen_postflight_active_test.rb
-- test/boxen_postflight_env_test.rb
-- test/boxen_preflight_creds_test.rb
-- test/boxen_preflight_etc_my_cnf_test.rb
-- test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
-- test/boxen_puppeteer_test.rb
-- test/boxen_runner_test.rb
 - test/boxen_service_test.rb
 - test/boxen_util_test.rb
+- test/command/help_test.rb
+- test/command/project/install_test.rb
+- test/command/project_test.rb
+- test/command/run_test.rb
+- test/command/service/disable_test.rb
+- test/command/service/enable_test.rb
+- test/command/service/restart_test.rb
+- test/command/service_test.rb
+- test/command/version_test.rb
 - test/fixtures/repo/modules/projects/manifests/first-project.pp
 - test/fixtures/repo/modules/projects/manifests/second-project.pp
+- test/postflight/boxen_postflight_active_test.rb
+- test/postflight/boxen_postflight_env_test.rb
+- test/postflight/boxen_postflight_github_issue_test.rb
+- test/postflight/boxen_postflight_web_hook_test.rb
+- test/preflight/boxen_preflight_creds_test.rb
+- test/preflight/boxen_preflight_etc_my_cnf_test.rb
+- test/preflight/boxen_preflight_homebrew_test.rb
+- test/preflight/boxen_preflight_rvm_test.rb
 - test/system_timer.rb