boxen 0.0.0 → 0.1.0

data/Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       ansi (~> 1.4)
       highline (~> 1.6)
       json_pure (~> 1.7)
+      librarian-puppet (~> 0.9)
       octokit (~> 1.15)
       puppet (~> 3.0)
 
@@ -24,6 +25,10 @@ GEM
     highline (1.6.15)
     json (1.7.5)
     json_pure (1.7.5)
+    librarian-puppet (0.9.5)
+      json
+      puppet
+      thor (~> 0.15)
     metaclass (0.0.1)
     minitest (3.5.0)
     mocha (0.12.6)
@@ -39,6 +44,7 @@ GEM
     puppet (3.0.0)
       facter (>= 1.6.11)
       hiera (>= 1.0.0rc)
+    thor (0.16.0)
 
 PLATFORMS
   ruby

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "0.0.0"
+  gem.version       = "0.1.0"
   gem.authors       = ["John Barnette", "Will Farrington"]
   gem.email         = ["jbarnette@github.com", "wfarr@github.com"]
   gem.description   = "Manage Mac development boxes with love (and Puppet)."
@@ -13,11 +13,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep /^test/
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "ansi",      "~> 1.4"
-  gem.add_dependency "highline",  "~> 1.6"
-  gem.add_dependency "json_pure", "~> 1.7"
-  gem.add_dependency "octokit",   "~> 1.15"
-  gem.add_dependency "puppet",    "~> 3.0"
+  gem.add_dependency "ansi",             "~> 1.4"
+  gem.add_dependency "highline",         "~> 1.6"
+  gem.add_dependency "json_pure",        "~> 1.7"
+  gem.add_dependency "librarian-puppet", "~> 0.9"
+  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"

data/lib/boxen/cli.rb

@@ -3,6 +3,7 @@ require "boxen/flags"
 require "boxen/postflight"
 require "boxen/preflight"
 require "boxen/puppeteer"
+require "boxen/util"
 
 module Boxen
   class CLI
@@ -37,9 +38,10 @@ module Boxen
         exit
       end
 
-      status = puppet.run
+      # Actually run Puppet and return its exit code. FIX: Here's
+      # where we'll reintegrate automatic error reporting.
 
-      return status
+      return puppet.run
     end
 
     # Run Boxen by wiring together the command-line flags, config,
@@ -59,6 +61,11 @@ module Boxen
 
       Boxen::Preflight.run config
 
+      # Okay, we're gonna run Puppet. Let's make some dirs.
+
+      Boxen::Util.sudo("mkdir", "-p", config.homedir) &&
+        Boxen::Util.sudo("chown", "#{config.user}:staff", config.homedir)
+
       # Save the config for Puppet (and next time).
 
       Boxen::Config.save config

data/lib/boxen/config.rb

@@ -55,6 +55,7 @@ module Boxen
         :puppetdir => config.puppetdir,
         :repodir   => config.repodir,
         :srcdir    => config.srcdir,
+        :token     => config.token,
         :user      => config.user
       }
 
@@ -240,6 +241,10 @@ module Boxen
 
     attr_writer :stealth
 
+    # A GitHub OAuth token. Default is `nil`.
+
+    attr_accessor :token
+
     # A local user login. Default is the `USER` environment variable.
 
     def user

data/lib/boxen/preflight/creds.rb

@@ -1,5 +1,6 @@
-require "highline"
 require "boxen/preflight"
+require "highline"
+require "octokit"
 
 # HACK: Unless this is `false`, HighLine has some really bizarre
 # problems with empty/expended streams at bizarre intervals.
@@ -7,10 +8,23 @@ require "boxen/preflight"
 HighLine.track_eof = false
 
 class Boxen::Preflight::Creds < Boxen::Preflight
-  def ok?
+  def basic?
     config.api.user rescue nil
   end
 
+  def ok?
+    basic? && token?
+  end
+
+  def token?
+    return unless config.token
+
+    tapi = Octokit::Client.new \
+      :login => config.login, :oauth_token => config.token
+
+    tapi.user rescue nil
+  end
+
   def run
     console = HighLine.new
 
@@ -24,11 +38,22 @@ class Boxen::Preflight::Creds < Boxen::Preflight
       q.echo = "*"
     end
 
-    unless ok?
+    unless basic?
       puts # i <3 vertical whitespace
 
       abort "Sorry, I can't auth you on GitHub.",
         "Please check your credentials and teams and give it another try."
     end
+
+    # Okay, the basic creds are good, let's deal with an OAuth token.
+
+    unless auth = config.api.authorizations.detect { |a| a.note == "Boxen" }
+      auth = config.api.create_authorization \
+        :note => "Boxen", :scopes => %w(repo user)
+    end
+
+    # Reset the token for later.
+
+    config.token = auth.token
   end
 end

data/lib/boxen/preflight/rvm.rb

@@ -0,0 +1,12 @@
+require "boxen/preflight"
+
+class Boxen::Preflight::RVM < Boxen::Preflight
+  def run
+    abort "You have an rvm installed in ~/.rvm.",
+      "The Setup uses rbenv to install ruby, so please `rvm implode`"
+  end
+
+  def ok?
+    !File.exist? "#{ENV['HOME']}/.rvm"
+  end
+end

data/lib/boxen/puppeteer.rb

@@ -25,7 +25,8 @@ module Boxen
 
       flags << ["--confdir",     "#{config.puppetdir}/conf"]
       flags << ["--vardir",      "#{config.puppetdir}/var"]
-      flags << ["--libdir",      "#{config.repodir}/lib"]
+      flags << ["--libdir",      "#{config.repodir}/lib"]#:#{root}/lib"]
+      flags << ["--libdir",      "#{root}/lib"]
       flags << ["--manifestdir", "#{config.repodir}/manifests"]
       flags << ["--modulepath",  "#{config.repodir}/modules:#{config.repodir}/shared"]
 
@@ -59,6 +60,19 @@ module Boxen
       FileUtils.mkdir_p File.dirname config.logfile
       FileUtils.touch config.logfile
 
+      if File.file? "Puppetfile"
+        librarian = "#{config.repodir}/bin/librarian-puppet"
+
+        # Set an environment variable for librarian-puppet's
+        # github_tarball source strategy.
+
+        ENV["GITHUB_API_TOKEN"] = config.token
+
+        unless system librarian, "install", "--path=#{config.repodir}/shared"
+          abort "Can't run Puppet, fetching dependencies with librarian failed."
+        end
+      end
+
       warn command.join " " if config.debug?
       Boxen::Util.sudo *command
 

data/lib/facter/boxen.rb

@@ -0,0 +1,22 @@
+require "json"
+require "boxen/config"
+
+config   = Boxen::Config.load
+facts    = {}
+factsdir = File.join config.homedir, "config", "facts"
+
+facts["github_login"]  = config.login
+facts["github_email"]  = config.email
+facts["github_name"]   = config.name
+facts["github_token"]  = config.token
+
+facts["boxen_home"]    = config.homedir
+facts["boxen_srcdir"]  = config.srcdir
+
+facts["luser"]         = config.user
+
+Dir["#{config.homedir}/config/facts/*.json"].each do |file|
+  facts.merge! JSON.parse File.read file
+end
+
+facts.each { |k, v| Facter.add(k) { setcode { v } } }

data/script/release

@@ -0,0 +1,30 @@
+#!/bin/sh
+# Tag and push a release.
+
+set -e
+
+# Make sure we're in the project root.
+
+cd $(dirname "$0")/..
+
+# Build a new gem archive.
+
+rm boxen-*.gem
+gem build -q boxen.gemspec
+
+# Figure out what version we're releasing.
+
+tag=v`ls boxen-*.gem | sed 's/^boxen-\(.*\)\.gem$/\1/'`
+
+# Make sure we haven't released this version before.
+
+git fetch -t origin
+
+(git tag -l | grep "$tag") && {
+  echo "Whoops, there's already a '${tag}' tag."
+  exit 1
+}
+
+# Tag it and bag it.
+
+gem push boxen-*.gem && git tag "$tag" && git push origin --tags

data/test/boxen_config_test.rb

@@ -147,6 +147,13 @@ def test_initialize
     assert @config.stealth?
   end
 
+  def test_token
+    assert_nil @config.token
+
+    @config.token = "foo"
+    assert_equal "foo", @config.token
+  end
+
   def test_user
     ENV.expects(:[]).with("USER").returns "foo"
     assert_equal "foo", @config.user

data/test/boxen_preflight_rvm_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxen
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,6 +60,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: librarian-puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -153,10 +169,13 @@ files:
 - lib/boxen/preflight/identity.rb
 - lib/boxen/preflight/os.rb
 - lib/boxen/preflight/rbenv.rb
+- lib/boxen/preflight/rvm.rb
 - lib/boxen/project.rb
 - lib/boxen/puppeteer.rb
 - lib/boxen/util.rb
+- lib/facter/boxen.rb
 - script/bootstrap
+- script/release
 - script/tests
 - test/boxen/test.rb
 - test/boxen_check_test.rb
@@ -165,6 +184,7 @@ files:
 - test/boxen_flags_test.rb
 - test/boxen_postflight_active_test.rb
 - test/boxen_postflight_env_test.rb
+- test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
 - test/boxen_puppeteer_test.rb
 - test/boxen_util_test.rb
@@ -203,6 +223,7 @@ test_files:
 - test/boxen_flags_test.rb
 - test/boxen_postflight_active_test.rb
 - test/boxen_postflight_env_test.rb
+- test/boxen_preflight_rvm_test.rb
 - test/boxen_project_test.rb
 - test/boxen_puppeteer_test.rb
 - test/boxen_util_test.rb