stevenson 2.3.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4206094ec9c9cd5d7b6d602bfa4d2e70f451fd0d
-  data.tar.gz: 9611f3c7f26787b466a819a665e01da8ae2da408
+  metadata.gz: 97d928ffe45af65dcbbefbbc752493eb19222b7f
+  data.tar.gz: '0307814dafdfc5e724fc2488e5a385cfc58e3b68'
 SHA512:
-  metadata.gz: d5a9b2ec688fd028192ed1dcb454b1332fc2be0097c174c1c9bde408cb87184cb70358ed8e267a6dd3fc43f264dec85b1ebc1952cd8d0e4c024fd81f1c372ac1
-  data.tar.gz: 47f99d5a09fb3728b1d221b6d3ed07c20b68bbae7c71a626f6afcb233c68e027bc62ddfaf4e22ab3e5800c0bd3b6061fca15678a5fdc81c9972aa320923609e4
+  metadata.gz: 005f50c0d0c0978484e0baa1c083e2c1a2d3454b439735f153bb60f440d1987ec1705627270b72201dd45fad47f511654b69c0780a72cf3e16483c767e9f73b3
+  data.tar.gz: 3ce5a16de26567a351b248ee35b25187dd79c41d84f8c6112db3564175a920ddb4cd933c932aeda551b3aa79946d20198b72a1c330ac745d7cfdb0201475371d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+2.5.0 (July 18th, 2018)
+ - Change fog dependency to fog-aws
+
+2.4.0 (July 17th, 2018)
+ - Add 'private_template' option for securely passing git credentials.
+
 2.3.3 (January 19th, 2016)
  - BUGFIX: Explicitly specify Jekyll output directory within
    temporary directory

data/README.md

@@ -50,6 +50,18 @@ option, like so:
 This will clone the repo at `https://github.com/YourUsername/YourTemplate.git`
 to `hello_world`.
 
+### Private Git Templates
+
+If you'd like to use a template in a private git repo, you can pass GitHub credentials or store them in ENV variables. This will take priority over the 'template' option above.
+
+    $ stevenson new hello_world --private_template https://github.com/YourUsername/YourTemplate.git bob 123
+
+This will clone the repo at `https://github.com/YourUsername/YourTemplate.git`
+to `hello_world`.
+
+Additionally, Stevenson can use the `GITHUB_SERVICE_ACCOUNT_USERNAME` and
+`GITHUB_SERVICE_ACCOUNT_PASSWORD` environment variables.
+
 ### Zip Output
 
 Stevenson can output directories as a zip archive using the `-z` or `--zip`

data/lib/stevenson/application.rb

@@ -9,10 +9,15 @@ module Stevenson
                   default: 'hyde-base',
                   desc: 'The template to use'
 
+    method_option :private_template,
+                  type: :array,
+                  desc: 'Private git template url and credentials. Takes priority over normal template option.'
+
     # Template Options
     method_option :branch,
                   aliases: '-b',
                   desc: 'The git branch you would like to use from your template'
+
     method_option :subdirectory,
                   aliases: '-s',
                   desc: 'The subdirectory to use from the template, if any'
@@ -28,6 +33,7 @@ module Stevenson
                   enum: [:zip],
                   aliases: "-o",
                   desc: 'Array of output filters to be applied in order'
+
     method_option :zip,
                   aliases: "-z",
                   desc: 'Zip compresses the output directory'
@@ -39,8 +45,17 @@ module Stevenson
                   desc: 'The s3 information necessary for deploying to S3'
 
     def new(output_directory, config_path)
+      if options[:private_template]
+        template_url, git_username, git_password = options[:private_template]
+        git_username ||= ENV["GITHUB_SERVICE_ACCOUNT_USERNAME"]
+        git_password ||= ENV["GITHUB_SERVICE_ACCOUNT_PASSWORD"]
+        template = template_url.gsub("github", "#{git_username}:#{git_password}@github")
+      else
+        template = options[:template]
+      end
+
       # Load the template using the template loader
-      template = Stevenson::Template.load(options[:template], options)
+      template = Stevenson::Template.load(template_url, options)
 
       # Place yml files
       template.place_config(config_path)

data/lib/stevenson/deployers/s3.rb

@@ -1,4 +1,4 @@
-require 'fog'
+require 'fog/aws'
 
 module Stevenson
   module Deployer

data/lib/stevenson/version.rb

@@ -1,3 +1,3 @@
 module Stevenson
-  VERSION = "2.3.3"
+  VERSION = "2.5.0"
 end

data/stevenson.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cocaine", "~> 0.5"
   spec.add_dependency "git"
-  spec.add_dependency "fog"
+  spec.add_dependency "fog-aws", "~> 3.0"
   spec.add_dependency "hashie"
   spec.add_dependency "highline"
   spec.add_dependency "jekyll"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stevenson
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.5.0
 platform: ruby
 authors:
 - RootsRated
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Stevenson is a generator for Jekyll microsites created by RootsRated.com