boxen 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49e4e86a9f5b48f4e1b3132c9fe255987f2462c
-  data.tar.gz: 1815fc3e8007ff5f144a02cfeb1c371e9d403de5
+  metadata.gz: cffbc20a2321cfcfdca7fe583bd73118486dcc77
+  data.tar.gz: 73893a045299bebec51c8d270af6e76c18c37a83
 SHA512:
-  metadata.gz: 6744941ef2b242aee8a50b4db4240618d9db566611cea73ed1ef568481743579bda5712f1149e99ee9bdd11834e83564bb5f21082141d593206189aa4efe56a8
-  data.tar.gz: a920d2c2465f6077b7ef9faa189f1cf521a11b7a80aa180e35bc1f16ca4d16f1f5c8eb5990985a2ae30ac672f17d2b3558bff9a8bdb03e15daa8fdf41db25c43
+  metadata.gz: c5f2f13dddcee592cfef053fb6b0a17a2c690d1ed9e8e100e83cd90c4bc525636505051a60b0b9a8cc71b1882ea55f92d346c67f86c4a6d6a9d27fbd88cc8015
+  data.tar.gz: fb9d784e16383c1e52a88a05791ffa1c42dbf4a8021259230d97d4bf89a1cf5c8474f5cec03fd8072380eb50d206ae2ff7362bd8f2c8eb7f79961810fc29ea0d

data/.gitignore

@@ -8,3 +8,4 @@
 /log
 /puppet
 /script/Boxen.dSYM
+/.ruby-version

data/boxen.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "2.1.0"
-  gem.authors       = ["John Barnette", "Will Farrington"]
-  gem.email         = ["jbarnette@github.com", "wfarr@github.com"]
+  gem.version       = "2.2.0"
+  gem.authors       = ["John Barnette", "Will Farrington", "David Goodlad"]
+  gem.email         = ["jbarnette@github.com", "wfarr@github.com", "dgoodlad@github.com"]
   gem.description   = "Manage Mac development boxes with love (and Puppet)."
   gem.summary       = "You know, for laptops and stuff."
   gem.homepage      = "https://github.com/boxen/boxen"

data/lib/boxen/preflight/creds.rb

@@ -65,25 +65,7 @@ class Boxen::Preflight::Creds < Boxen::Preflight
   end
 
   def run
-    console = HighLine.new
-    
-    if ENV['BOXEN_GITHUB_LOGIN'] || ENV['BOXEN_GITHUB_PASSWORD']
-      warn "Oh, looks like you've provided your username and password as environmental variables..."
-      config.login = ENV['BOXEN_GITHUB_LOGIN']
-      @password = ENV['BOXEN_GITHUB_PASSWORD']
-    else
-      warn "Hey, I need your current GitHub credentials to continue."
-
-      config.login = console.ask "GitHub login: " do |q|
-        q.default = config.login || config.user
-        q.validate = /\A[^@]+\Z/
-      end
-
-      @password = console.ask "GitHub password: " do |q|
-        q.echo = "*"
-      end
-    end
-    
+    fetch_login_and_password
     tokens = get_tokens
 
     unless auth = tokens.detect { |a| a.note == "Boxen" }
@@ -101,4 +83,26 @@ class Boxen::Preflight::Creds < Boxen::Preflight
         "I was able to get your OAuth token, but was unable to use it."
     end
   end
+
+  private
+
+  def fetch_login_and_password
+    console = HighLine.new
+
+    config.login = fetch_from_env("login") || console.ask("GitHub login: ") do |q|
+      q.default = config.login || config.user
+      q.validate = /\A[^@]+\Z/
+    end
+
+    @password = fetch_from_env("password") || console.ask("GitHub password: ") do |q|
+      q.echo = "*"
+    end
+  end
+
+  def fetch_from_env(thing)
+    key = "BOXEN_GITHUB_#{thing.upcase}"
+    return unless found = ENV[key]
+    warn "Oh, looks like you've provided your #{thing} as environmental variable..."
+    found
+  end
 end

data/lib/boxen/runner.rb

@@ -127,7 +127,7 @@ module Boxen
       # --restart-services restarts all services
 
       if flags.restart_services?
-        Boxen::Service.list.each do |service|
+        Boxen::Service.list_enabled.each do |service|
           puts "Restarting #{service}..."
           service.disable
           service.enable

data/lib/boxen/service.rb

@@ -10,6 +10,13 @@ module Boxen
       end
     end
 
+    def self.list_enabled
+      prefix = /^dev\./
+      enabled = capture_output("sudo /bin/launchctl list").split("\n").map { |l| l.split(/\s/) }.map(&:last)
+      names = enabled.grep(prefix).map { |name| name.sub(prefix, "") }.compact
+      names.map { |name| new(name) }
+    end
+
     def initialize(name)
       @name = name
     end
@@ -26,9 +33,12 @@ module Boxen
       Boxen::Util.sudo('/bin/launchctl', 'unload', '-w', location)
     end
 
-
     private
 
+    def self.capture_output(command)
+      `#{command}`
+    end
+
     def location
       "#{self.class.location}/dev.#{name}.plist"
     end

data/test/boxen_preflight_creds_test.rb

@@ -1,4 +1,5 @@
 require 'boxen/test'
+require 'boxen/config'
 require 'boxen/preflight/creds'
 
 class BoxenPreflightCredsTest < Boxen::Test
@@ -7,6 +8,8 @@ class BoxenPreflightCredsTest < Boxen::Test
       c.user  = 'mojombo'
       c.token = 'sekr3t!'
     end
+    ENV.delete("BOXEN_GITHUB_LOGIN")
+    ENV.delete("BOXEN_GITHUB_PASSWORD")
   end
 
   def test_basic
@@ -37,4 +40,41 @@ class BoxenPreflightCredsTest < Boxen::Test
     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
+    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
+    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
+    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_runner_test.rb

@@ -118,7 +118,7 @@ class BoxenRunnerTest < Boxen::Test
       service.expects(:disable).once
       service.expects(:enable).once
     end
-    Boxen::Service.stubs(:list).returns(services)
+    Boxen::Service.stubs(:list_enabled).returns(services)
 
     assert_raises(SystemExit) do
       runner.process

data/test/boxen_service_test.rb

@@ -12,6 +12,12 @@ class BoxenServiceTest < Boxen::Test
     assert_equal ['other', 'test'], services.collect(&:name).sort
   end
 
+  def test_list_enabled
+    Boxen::Service.expects(:capture_output).with("sudo /bin/launchctl list").returns "foo bar dev.baz\nfoo bar bazz"
+    services = Boxen::Service.list_enabled
+    assert_equal ['baz'], services.collect(&:name)
+  end
+
   def test_enable
     service = Boxen::Service.new('blip')
     Boxen::Util.expects(:sudo).with('/bin/launchctl', 'load', '-w',

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: boxen
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - John Barnette
 - Will Farrington
+- David Goodlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -147,12 +148,12 @@ description: Manage Mac development boxes with love (and Puppet).
 email:
 - jbarnette@github.com
 - wfarr@github.com
+- dgoodlad@github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -265,3 +266,4 @@ test_files:
 - test/fixtures/repo/modules/projects/manifests/first-project.pp
 - test/fixtures/repo/modules/projects/manifests/second-project.pp
 - test/system_timer.rb
+has_rdoc: 

data/.ruby-version

@@ -1 +0,0 @@
-system