stevenson 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9085412145e88fbe98c683633a26ffb6c6616380
-  data.tar.gz: 91a2c10e1f490f9a0b446eaef403b96ae72ad3b0
+  metadata.gz: 2626791a8038889e6ac36440208c3625a5adf3ae
+  data.tar.gz: 839f9c26cd3f01c0ccf9ab5fde9d328013c7e750
 SHA512:
-  metadata.gz: d31b0a9d249e5881ad59c42f2f2579d92d411d4d0534c73e7305280cf68b9a38031129b33543ee10fbe0c19a9e49d2c5536711eb93e542ce7d13c746ee27307d
-  data.tar.gz: 68b0e3f40bb7c978697f502b921e78a65d65a3070920570dd9ea341cb893ca8f6ff6e3cd3237ffe14fa41db47aee551e8600d8f01170d51ce4ffb014f6c02f90
+  metadata.gz: ee524f0970ac01c4acfefb25669d98f546d84f0a5edf63f31b2a567cc14d35cbab8ed22d28983f659d110536c04adff180591119397aa9aa62152b1dcbf77ae2
+  data.tar.gz: a06f034f5885649317729a9cd2b53e87ada3671c5c713f0b8cb9b63102bd0018d199a06e4606b89a1be730a29446ca5d4cf9feae88731d622a43607d3cb6c04a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.3.0 (December 30th, 2015)
+ - Fix zip creation
+ - Add ability to specify zip filename
+ - Pass CLI options to Output Filters
+
 2.2.2 (December 11th, 2015)
  - Add a clearer error message to Template message
  - Refactor user directory fetch to try ENV (or default to root on

data/lib/stevenson/application.rb

@@ -29,7 +29,6 @@ module Stevenson
                   aliases: "-o",
                   desc: 'Array of output filters to be applied in order'
     method_option :zip,
-                  type: :boolean,
                   aliases: "-z",
                   desc: 'Zip compresses the output directory'
 

data/lib/stevenson/deployers/s3.rb

@@ -13,12 +13,22 @@ module Stevenson
       end
 
       def deploy!(directory)
-        Dir.glob("#{directory}/**/*").each do |file|
+        entries_for(directory).each do |file_path, file_name|
           s3_bucket.files.create(
-            key:    File.join(deployment_key, file.partition(directory).last),
-            body:   File.read(file),
+            key:    File.join(deployment_key, file_name),
+            body:   File.read(file_path),
             public: true,
-          ) if File.file?(file)
+          ) if File.file?(file_path)
+        end
+      end
+
+      def entries_for(directory)
+        if File.file?(directory)
+          [
+            [directory, File.basename(directory)]
+          ]
+        else
+          Dir.glob("#{directory}/**/*").collect { |f| [f, f.partition(directory).last] }
         end
       end
 

data/lib/stevenson/output_filter.rb

@@ -6,7 +6,7 @@ module Stevenson
     autoload :Generator, 'stevenson/output_filter/generator'
 
     class Base
-      attr_reader :directory
+      attr_reader :directory, :options
 
       def self.included(filter)
         filter.extend ClassMethods
@@ -20,8 +20,8 @@ module Stevenson
         end
       end
 
-      def initialize(directory)
-        @directory = directory
+      def initialize(directory, options)
+        @directory, @options = directory, options
       end
 
       def output

data/lib/stevenson/output_filter/generator.rb

@@ -9,7 +9,7 @@ module Stevenson
 
       def generate!(template)
         filters.inject(template.local_directory) do |rendered, filter|
-          OutputFilter.filter_for(filter).new(rendered).output
+          OutputFilter.filter_for(filter).new(rendered, options).output
         end
       end
 

data/lib/stevenson/output_filters/jekyll.rb

@@ -8,7 +8,7 @@ module Stevenson
           `jekyll b`
         end
 
-        File.join(directory, '_site', '.')
+        File.join(directory, '_site')
       end
     end
   end

data/lib/stevenson/output_filters/zip.rb

@@ -5,12 +5,16 @@ module Stevenson
     class Zip < Base
 
       def output
-        "#{directory}.zip".tap do |dir|
+        File.join(directory, "#{zip_file_name}.zip").tap do |output_zip_path|
           # Zip up the output directory
-          write directory, dir
+          write directory, output_zip_path
         end
       end
 
+      def zip_file_name
+        options[:zip] == "zip" ? File.basename(directory) : options[:zip]
+      end
+
       private
 
       def write(inputDir, outputFile)
@@ -31,7 +35,7 @@ module Stevenson
           zipFilePath = path == "" ? entry : File.join(path, entry)
           diskFilePath = File.join(@inputDir, zipFilePath)
           if File.directory?(diskFilePath)
-            io.mkdir(zipFilePath)
+            io.mkdir(zipFilePath) unless io.find_entry(zipFilePath)
             subdir = Dir.entries(diskFilePath); subdir.delete("."); subdir.delete("..")
             writeEntries(subdir, zipFilePath, io)
           else

data/lib/stevenson/version.rb

@@ -1,3 +1,3 @@
 module Stevenson
-  VERSION = "2.2.2"
+  VERSION = "2.3.1"
 end

data/spec/lib/output_filter/generator_spec.rb

@@ -11,7 +11,7 @@ describe Stevenson::OutputFilter::Generator do
     end
 
     it "should create a new filter for the jekyll filter's output" do
-      expect(Stevenson::OutputFilter::Jekyll).to receive(:new).with(template.local_directory).and_call_original
+      expect(Stevenson::OutputFilter::Jekyll).to receive(:new).with(template.local_directory, options).and_call_original
       subject.generate!(template)
     end
 
@@ -20,16 +20,16 @@ describe Stevenson::OutputFilter::Generator do
     end
 
     context "when more than one filter exists" do
-      let(:options) { { zip: true } }
+      let(:options) { { zip: "zip" } }
       let(:zip_filter) { double(:zip_filter, output: zip_output) }
 
       it "should build subsequent filters with the previous' output" do
-        expect(Stevenson::OutputFilter::Zip).to receive(:new).with(jekyll_output).and_return(zip_filter)
+        expect(Stevenson::OutputFilter::Zip).to receive(:new).with(jekyll_output, options).and_return(zip_filter)
         subject.generate!(template)
       end
 
       it "should return the subsequent filter's output" do
-        allow(Stevenson::OutputFilter::Zip).to receive(:new).with(jekyll_output).and_return(zip_filter)
+        allow(Stevenson::OutputFilter::Zip).to receive(:new).with(jekyll_output, options).and_return(zip_filter)
         expect(subject.generate!(template)).to eq zip_output
       end
     end

data/spec/lib/output_filters/jekyll_spec.rb

@@ -1,7 +1,8 @@
 describe Stevenson::OutputFilter::Jekyll do
+  let(:options) { {} }
   let(:temporary_directory) { '/tmp/directory' }
   let(:template) { double(:template, local_directory: temporary_directory) }
-  subject { described_class.new(template.local_directory) }
+  subject { described_class.new(template.local_directory, options) }
 
   describe '#output' do
     it "should change into the template's directory" do
@@ -17,7 +18,7 @@ describe Stevenson::OutputFilter::Jekyll do
 
     it 'outputs a jekyll compiled directory' do
       allow(Dir).to receive(:chdir).with(temporary_directory)
-      expect(subject.output).to eq File.join(temporary_directory, '_site', '.')
+      expect(subject.output).to eq File.join(temporary_directory, '_site')
     end
   end
 end

data/spec/lib/output_filters/zip_spec.rb

@@ -1,10 +1,11 @@
 describe Stevenson::OutputFilter::Zip do
+  let(:options) { { zip: "zip"} }
   let(:temporary_directory) { '/tmp/directory' }
   let(:template) { double(:template, local_directory: temporary_directory) }
-  subject { described_class.new(template.local_directory) }
+  subject { described_class.new(template.local_directory, options) }
 
   describe '#output' do
-    let(:output_zip) { "#{temporary_directory}.zip" }
+    let(:output_zip) { "#{temporary_directory}/#{File.basename(temporary_directory)}.zip" }
 
     it "should zip the files in temporary_directory to the zip" do
       expect(subject).to receive(:write).with(temporary_directory, output_zip).and_return(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stevenson
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors:
 - RootsRated
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler