capistrano-middleman 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34876824ba2dc393f73ed7f0727847fe3695c4f
-  data.tar.gz: b460995cb2c51d550986aca589a6734c59b17ce8
+  metadata.gz: 20ef72c54f88074387e47ea56baac694d8519269
+  data.tar.gz: 62761d57e50eab04f03f71d421cb83a03ef3e1fe
 SHA512:
-  metadata.gz: 1140b941732728b758890d6cc9614891dc589c19219be2e42196d49e0893a193785d5c2d0181e6d7e6c1f6af16429db0c91162068c5e5981f83195dd092bda38
-  data.tar.gz: b4ee9490f710bce07755fa7818b2288b76b0efc1634f044737585768fface396c90dbf04b52e5bf48a28c7597bca121b4db13f6c61250cf664685decfc7e77dd
+  metadata.gz: 24ab29860962edecfeadace9bc2f7e36632c568475bf010c63a8e5ce63015fd8c9a5f1ec111fb8ee3646f7e35dbc51e76b138fe5967470dc7a88854fec040a65
+  data.tar.gz: 9042e73bf9b3ed7cefcc0f376e5f20249aa247c6694a5bac93f735969744d15fb3e65105c9732b928ba1e79a17845e14bef6994f53d596afc3ac268b239c61f2

data/.rubocop.yml

@@ -12,7 +12,7 @@ Metrics/LineLength:
 
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
-  Max: 6
+  Max: 8
 
 Style/CaseEquality:
   Enabled: false

data/Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 PATH
   remote: .
   specs:
-    capistrano-middleman (0.0.1)
+    capistrano-middleman (0.1.2)
       capistrano (~> 3)
       middleman (~> 3.3)
       rubyzip (~> 1.1.7)
@@ -125,7 +125,7 @@ GEM
       term-ansicolor
       yard (~> 0.8.7.5)
     json (1.8.2)
-    kramdown (1.6.0)
+    kramdown (1.7.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     license_finder (2.0.4)

data/lib/capistrano/middleman/utils.rb

@@ -1,6 +1,25 @@
 module Capistrano
   module Middleman
+    # Utils
     module Utils
+      # Create zip archive from source directory
+      #
+      # @param [String] source_directory
+      #   The directory
+      # @param [String] destination_file
+      #   Name of the zip file
+      # @param [String] prefix
+      #   Prefix inside zip file
+      # @param [String] working_directory
+      #   The directory where rubyzip should change to
+      # @param [Array] exclude_patterns
+      #   Ignore files matching patterns
+      # @param [TrueClass, FalseClass] keep_filesystem_permissions
+      #   Record permissions in file system
+      # @param [OctalNumber] file_permissions
+      #   Permissions for files
+      # @param [OctalNumber] directory_permissions
+      #   Permissions for directories
       def zip(
         source_directory,
         destination_file,
@@ -16,7 +35,7 @@ module Capistrano
         exclude_patterns.each { |e| list.exclude e }
 
         Zip::File.open(destination_file, Zip::File::CREATE) do |z|
-          list.each do |filename|
+          list.uniq.each do |filename|
             paths = []
             paths << Pathname.new(prefix) unless prefix.nil? || prefix.empty?
             paths << Pathname.new(filename).relative_path_from(Pathname.new(working_directory))
@@ -25,7 +44,7 @@ module Capistrano
 
             next if keep_filesystem_permissions
 
-            z.file.chmod(file_permissions , File.join(*paths)) if z.file.file? File.join(*paths)
+            z.file.chmod(file_permissions, File.join(*paths)) if z.file.file? File.join(*paths)
             z.file.chmod(directory_permissions, File.join(*paths)) if z.file.directory? File.join(*paths)
           end
         end

data/lib/capistrano/middleman/version.rb

@@ -3,6 +3,6 @@
 module Capistrano
   # Middleman
   module Middleman
-    VERSION = '0.1.0'
+    VERSION = '0.1.3'
   end
 end

data/lib/capistrano/middleman.rb

@@ -2,5 +2,6 @@ require 'zip'
 require 'zip/filesystem'
 require 'pathname'
 require 'capistrano/middleman/utils'
+require 'tempfile'
 
 load File.expand_path('../tasks/middleman.rake', __FILE__)

data/lib/capistrano/tasks/middleman.rake

@@ -1,7 +1,9 @@
+require 'securerandom'
 namespace :middleman do
   middleman_options = Array(fetch(:middleman_options, %w(--verbose)))
 
-  archive_name                = fetch :archive_name, 'archive.zip'
+  archive_prefix              = fetch :archive_prefix, 'archive'
+  archive_name                = format('%s-%s.zip', archive_prefix, SecureRandom.hex)
   build_dir                   = fetch :build_dir, 'build'
   source_dir                  = fetch :source_dir, 'source'
   keep_filesystem_permissions = fetch :keep_filesystem_permissions, false
@@ -13,19 +15,19 @@ namespace :middleman do
   tar_roles         = fetch(:tar_roles, :all)
   desc "Archive files to #{archive_name}"
   file archive_name => source_dir do |t|
-    cmd = %w(middleman build)
-    cmd.concat middleman_options
-    sh cmd.join(' ')
+    run_locally do
+      execute :middleman, 'build', *middleman_options
 
-    Capistrano::Middleman::Utils.zip(
-      build_dir,
-      t.name,
-      working_directory: build_dir,
-      exclude_patterns: exclude_patterns,
-      keep_filesystem_permissions: keep_filesystem_permissions,
-      directory_permissions: directory_permissions,
-      file_permissions: file_permissions
-    )
+      Capistrano::Middleman::Utils.zip(
+        build_dir,
+        t.name,
+        working_directory: build_dir,
+        exclude_patterns: exclude_patterns,
+        keep_filesystem_permissions: keep_filesystem_permissions,
+        directory_permissions: directory_permissions,
+        file_permissions: file_permissions
+      )
+    end
   end
 
   desc "Build #{archive_name} on localhost"
@@ -50,8 +52,8 @@ namespace :middleman do
       # Upload the archive, extract it and finally remove the tmp_file
       upload!(archive_file, tmp_file)
 
-      umask = capture('umask')
-      debug "umask on remote system #{host} is #{umask}"
+      # umask = capture('umask')
+      # debug "umask on remote system #{host} is #{umask}"
 
       execute :unzip, tmp_file, '-d', release_path
       execute :rm, '-f', tmp_file
@@ -61,7 +63,7 @@ namespace :middleman do
   desc 'Cleaning up deploy'
   task :clean do |_t|
     FileUtils.rm_rf build_dir
-    FileUtils.rm_rf archive_name
+    FileUtils.rm_rf format('%s-%s.zip', archive_prefix, '*')
   end
 
   after 'deploy:finished', 'middleman:clean'
@@ -69,3 +71,4 @@ namespace :middleman do
   task :check
   task :set_current_revision
 end
+

data/lib/capistrano-middleman.rb

@@ -1 +1,3 @@
+# rubocop:disable Style/FileName
 require 'capistrano/middleman/version'
+# rubocop:enable Style/FileName

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-middleman
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler