boxen 1.1.2 → 1.2.0

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "1.1.2"
+  gem.version       = "1.2.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)."

data/lib/boxen/config.rb

@@ -29,6 +29,14 @@ module Boxen
         config.password = keychain.password
         config.token    = keychain.token
 
+        if config.enterprise?
+          # configure to talk to GitHub Enterprise
+          Octokit.configure do |c|
+            c.api_endpoint = "#{config.ghurl}/api/v3"
+            c.web_endpoint = config.ghurl
+          end
+        end
+
         yield config if block_given?
       end
     end
@@ -39,16 +47,18 @@ module Boxen
 
     def self.save(config)
       attrs = {
-        :email     => config.email,
-        :fde       => config.fde?,
-        :homedir   => config.homedir,
-        :login     => config.login,
-        :name      => config.name,
-        :puppetdir => config.puppetdir,
-        :repodir   => config.repodir,
-        :reponame  => config.reponame,
-        :srcdir    => config.srcdir,
-        :user      => config.user
+        :email        => config.email,
+        :fde          => config.fde?,
+        :homedir      => config.homedir,
+        :login        => config.login,
+        :name         => config.name,
+        :puppetdir    => config.puppetdir,
+        :repodir      => config.repodir,
+        :reponame     => config.reponame,
+        :ghurl        => config.ghurl,
+        :srcdir       => config.srcdir,
+        :user         => config.user,
+        :repotemplate => config.repotemplate
       }
 
       file = "#{config.homedir}/config/boxen/defaults.json"
@@ -220,9 +230,12 @@ module Boxen
       return override unless override.nil?
 
       if File.directory? repodir
+        ghuri = URI(ghurl)
         url = Dir.chdir(repodir) { `git config remote.origin.url`.strip }
 
-        if $?.success? && %r|github\.com[/:]([^/]+/[^/]+)| =~ url
+        # find the path and strip off the .git suffix
+        repo_exp = Regexp.new Regexp.escape(ghuri.host) + "[/:]([^/]+/[^/]+)"
+        if $?.success? && repo_exp.match(url)
           @reponame = $1.sub /\.git$/, ""
         end
       end
@@ -230,6 +243,29 @@ module Boxen
 
     attr_writer :reponame
 
+    # GitHub location (public or GitHub Enterprise)
+
+    def ghurl
+      @ghurl || ENV["BOXEN_GITHUB_ENTERPRISE_URL"] || "https://github.com"
+    end
+
+    attr_writer :ghurl
+
+    # Repository URL template (required for GitHub Enterprise)
+
+    def repotemplate
+      default = 'https://github.com/%s'
+      @repotemplate || ENV["BOXEN_REPO_URL_TEMPLATE"] || default
+    end
+
+    attr_writer :repotemplate
+
+    # Does this Boxen use a GitHub Enterprise instance?
+
+    def enterprise?
+      ghurl != "https://github.com"
+    end
+
     # The directory where repos live. Default is
     # `"/Users/#{user}/src"`.
 

data/lib/boxen/hook/github_issue.rb

@@ -18,7 +18,7 @@ module Boxen
 
       def compare_url
         return unless config.reponame
-        "https://github.com/#{config.reponame}/compare/#{checkout.sha}...master"
+        "#{config.ghurl}/#{config.reponame}/compare/#{checkout.sha}...master"
       end
 
       def hostname

data/lib/boxen/puppeteer.rb

@@ -27,6 +27,14 @@ module Boxen
       [puppet, "apply", flags, manifest].flatten
     end
 
+    def hiera_config
+      if File.exist? "#{config.repodir}/config/hiera.yaml"
+        "#{config.repodir}/config/hiera.yaml"
+      else
+        "/dev/null"
+      end
+    end
+
     def flags
       flags = []
       root  = File.expand_path "../../..", __FILE__
@@ -40,8 +48,7 @@ module Boxen
       flags << ["--modulepath",  "#{config.repodir}/modules:#{config.repodir}/shared"]
 
       # Don't ever complain about Hiera to me
-
-      flags << ["--hiera_config", "/dev/null"]
+      flags << ["--hiera_config", hiera_config]
 
       # Log to both the console and a file.
 
@@ -82,10 +89,11 @@ module Boxen
       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 config.enterprise?
+          # Set an environment variable for librarian-puppet's
+          # github_tarball source strategy.
+          ENV["GITHUB_API_TOKEN"] = config.token
+        end
 
         librarian_command = [librarian, "install", "--path=#{config.repodir}/shared"]
         librarian_command << "--verbose" if config.debug?

data/test/boxen_config_test.rb

@@ -135,6 +135,51 @@ class BoxenConfigTest < Boxen::Test
     ENV["BOXEN_PUPPET_DIR"] = val
   end
 
+  def test_ghurl
+    @config.ghurl = "https://git.foo.com"
+    assert_equal "https://git.foo.com", @config.ghurl
+  end
+
+  def test_ghurl_blank
+    assert_equal "https://github.com", @config.ghurl
+  end
+
+  def test_gheurl_env_var
+    val = ENV['BOXEN_GITHUB_ENTERPRISE_URL']
+
+    ENV['BOXEN_GITHUB_ENTERPRISE_URL'] = 'https://git.foo.com'
+    assert_equal "https://git.foo.com", @config.ghurl
+
+    ENV['BOXEN_GITHUB_ENTERPRISE_URL'] = val
+  end
+
+  def test_enterprise_true
+    @config.ghurl = "https://git.foo.com"
+    assert @config.enterprise?
+  end
+
+  def test_enterprise_false
+    assert @config.enterprise? == false
+  end
+
+  def test_repotemplate
+    @config.repotemplate = 'https://git.foo.com/%s'
+    assert_equal 'https://git.foo.com/%s', @config.repotemplate
+  end
+
+  def test_repotemplate_blank
+    assert_equal 'https://github.com/%s', @config.repotemplate
+  end
+
+  def test_repotemplate_env_var
+    val = ENV['BOXEN_REPO_URL_TEMPLATE']
+
+    ENV['BOXEN_REPO_URL_TEMPLATE'] = 'https://git.foo.com/%s'
+    assert_equal 'https://git.foo.com/%s', @config.repotemplate
+
+    ENV['BOXEN_REPO_URL_TEMPLATE'] = val
+  end
+
   def test_repodir
     @config.repodir = nil
     assert_equal Dir.pwd, @config.repodir
@@ -175,6 +220,29 @@ class BoxenConfigTest < Boxen::Test
     assert_equal "some-org/our-boxen", @config.reponame
   end
 
+  def test_reponame_git_config_ghurl
+    @config.ghurl = 'https://git.foo.com'
+    @config.expects(:"`").with("git config remote.origin.url").
+      returns "https://git.foo.com/some-org/our-boxen\n"
+
+    assert_equal "some-org/our-boxen", @config.reponame
+  end
+
+  def test_reponame_git_config_git_protocol
+    @config.expects(:"`").with("git config remote.origin.url").
+      returns "git@github.com:some-org/our-boxen.git\n"
+
+    assert_equal "some-org/our-boxen", @config.reponame
+  end
+
+  def test_reponame_git_config_git_protocol_ghurl
+    @config.ghurl = 'https://git.foo.com'
+    @config.expects(:"`").with("git config remote.origin.url").
+      returns "git@git.foo.com:some-org/our-boxen.git\n"
+
+    assert_equal "some-org/our-boxen", @config.reponame
+  end
+
   def test_reponame_git_config_bad_exit
     @config.expects(:"`").with("git config remote.origin.url").returns ""
     $?.expects(:success?).returns false
@@ -190,6 +258,14 @@ class BoxenConfigTest < Boxen::Test
     assert_nil @config.reponame
   end
 
+  def test_reponame_git_config_bad_url_git_protocol
+    @config.expects(:"`").with("git config remote.origin.url").
+      returns "git@spumco.com:some-org/our-boxen.git\n"
+    $?.expects(:success?).returns true
+
+    assert_nil @config.reponame
+  end
+
   def test_reponame_git_config_git_extension
     @config.expects(:"`").with("git config remote.origin.url").
       returns "https://github.com/some-org/our-boxen.git\n"
@@ -198,6 +274,15 @@ class BoxenConfigTest < Boxen::Test
     assert_equal "some-org/our-boxen", @config.reponame
   end
 
+  def test_reponame_git_config_git_extension_ghurl
+    @config.ghurl = 'https://git.foo.com'
+    @config.expects(:"`").with("git config remote.origin.url").
+      returns "https://git.foo.com/some-org/our-boxen.git\n"
+    $?.expects(:success?).returns true
+
+    assert_equal "some-org/our-boxen", @config.reponame
+  end
+
   def test_srcdir
     val = ENV["BOXEN_SRC_DIR"]
     ENV["BOXEN_SRC_DIR"] = nil

data/test/boxen_hook_github_issue_test.rb

@@ -56,6 +56,16 @@ class BoxenHookGitHubIssueTest < Boxen::Test
     assert_equal expected, @hook.compare_url
   end
 
+  def test_compare_url_ghurl
+    @config.reponame = repo = 'org/repo'
+    @config.ghurl = 'https://git.foo.com'
+    sha = 'deadbeef'
+    @checkout.expects(:sha).returns(sha)
+
+    expected = "https://git.foo.com/#{repo}/compare/#{sha}...master"
+    assert_equal expected, @hook.compare_url
+  end
+
   def test_hostname
     @hook.expects(:"`").with("hostname").returns "whatevs.local\n"
     assert_equal "whatevs.local", @hook.hostname

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-25 00:00:00 -07:00
+date: 2013-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency