boxen 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27abc61c0e4d62db329ccafa124c37a67526f1ec
-  data.tar.gz: f35bedb11781b8e030594e3650d85bb0770414bb
+  metadata.gz: d95ca24fcf7d0de14659e6b07e27c11ca2676f3b
+  data.tar.gz: e3ac4757e294c664446c3ae4e7f10c596f7f94da
 SHA512:
-  metadata.gz: 9f413c0aea5fb929ac044afee933171d163ad7a3ff6207c45c8c3807e913f469b055cc61dff36b4816df655d7f5b1b3a28e7029e6e185957b6bcb7ad6602dc19
-  data.tar.gz: 15a1cab0bb1e80f8f736e67e3c5d0509f87eb33e3c381928f13cc8a74bd7e6303e27d8d7545fe050a35595c05f8b0a0567302ae99905db836b742a09f8509d56
+  metadata.gz: 7ae4e801e9c215671043bddcd3f491e9d406de0a8b8cb266defb86628e3534417cd545d80c752d94d1734e8657f9608907f23050e179f8704052349a36902eb3
+  data.tar.gz: 011a9e776c0ea8c3f28b65ea76e0f71809d98219fa5c43733ae3780eada2e367ce4f64bdd3868a467bab83bb344916a4f6a876888b8e09c42174b149e951dfa3

data/boxen.gemspec

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

@@ -57,7 +57,9 @@ module Boxen
         :ghurl        => config.ghurl,
         :srcdir       => config.srcdir,
         :user         => config.user,
-        :repotemplate => config.repotemplate
+        :repotemplate => config.repotemplate,
+        :s3host       => config.s3host,
+        :s3bucket     => config.s3bucket
       }
 
       file = "#{config.homedir}/config/boxen/defaults.json"
@@ -291,12 +293,30 @@ module Boxen
       @user || ENV["USER"]
     end
 
-    attr_writer :color
+    attr_writer :user
 
     def color?
       @color
     end
 
-    attr_writer :user
+    attr_writer :color
+
+    # The S3 host name. Default is `"s3.amazonaws.com"`.
+    # Respects the `BOXEN_S3_HOST` environment variable.
+
+    def s3host
+      @s3host || ENV["BOXEN_S3_HOST"] || "s3.amazonaws.com"
+    end
+
+    attr_writer :s3host
+
+    # The S3 bucket name. Default is `"boxen-downloads"`.
+    # Respects the `BOXEN_S3_BUCKET` environment variable.
+
+    def s3bucket
+      @s3bucket || ENV["BOXEN_S3_BUCKET"] || "boxen-downloads"
+    end
+
+    attr_writer :s3bucket
   end
 end

data/test/boxen_config_test.rb

@@ -347,4 +347,47 @@ class BoxenConfigTest < Boxen::Test
     assert_equal api, @config.api
     assert_equal api, @config.api  # This extra call plus the `once` on the expectation is for the ivar cache.
   end
+
+  def test_s3host
+    val = ENV["BOXEN_S3_HOST"]
+    ENV["BOXEN_S3_HOST"] = nil
+
+    assert_equal "s3.amazonaws.com", @config.s3host
+
+    @config.s3host = "example.com"
+    assert_equal "example.com", @config.s3host
+  ensure
+    ENV["BOXEN_S3_HOST"] = val
+  end
+
+  def test_s3host_env_var
+    val = ENV["BOXEN_S3_HOST"]
+
+    ENV["BOXEN_S3_HOST"] = "example.com"
+    assert_equal "example.com", @config.s3host
+
+  ensure
+    ENV["BOXEN_S3_HOST"] = val
+  end
+
+  def test_s3bucket
+    val = ENV["BOXEN_S3_BUCKET"]
+    ENV["BOXEN_S3_BUCKET"] = nil
+
+    assert_equal "boxen-downloads", @config.s3bucket
+
+    @config.s3bucket = "my-bucket"
+    assert_equal "my-bucket", @config.s3bucket
+  ensure
+    ENV["BOXEN_S3_BUCKET"] = val
+  end
+
+  def test_s3host_env_var
+    val = ENV["BOXEN_S3_BUCKET"]
+
+    ENV["BOXEN_S3_BUCKET"] = "my-bucket"
+    assert_equal "my-bucket", @config.s3bucket
+  ensure
+    ENV["BOXEN_S3_BUCKET"] = val
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxen
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - John Barnette
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -264,4 +264,3 @@ 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: