roger 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50192701fd5bb385f0a32bbea440e6d3cdabfe04
-  data.tar.gz: 01cc88f4484ed65082066cd8d08cf07867173c38
+  metadata.gz: caddf4eeab48f002fe5dd4ed88b27c280117c3dd
+  data.tar.gz: ed435759636d5ce8390be0d68fb681a8ab0f796a
 SHA512:
-  metadata.gz: 60257be39ef76dcc63add66ce63b6ff87d5607defcc6fb9b6de6da6198ec4f1fa5516a7a6603f4d12bb3aa95a5e773aec022a35da70d9d276929c4eac2a7ac51
-  data.tar.gz: 4b33e90cc66ecab64f1683465ce5e5b91f0e8920a76c4754ae0514abd7bf131837afe236f816fde78da8ef8ff25fcfbbbd43cfb5591c54abb777cf37c62c7483
+  metadata.gz: 0ebee35b52dbad2cfe78fb7f8a767fc7aab6388cd79e9ad734a92ce0311d7a9804b6b6abf84a04c6726d22d0170ffc4b2cdf3887e271a5089e08e3e5015d23a9
+  data.tar.gz: c0f4f642ac62535fa9723342ecbc8c5789279eff1533cfacfd53d4887b3f24b28779209cd5d61a1bf0d2ac99d7d0c02e00a131225e227ee2683c82fb5bce0b5b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 1.3.3
+* Add tests for rsync finalizer and get_files
+* Get files now only matches files, not directories
+* Rsync finalizer works with $CHILD_STATUS
+
 ## Version 1.3.2
 * Fix for missing variable in zip finalizer
 * Fix passing options within Mockup

data/lib/roger/helpers/get_files.rb

@@ -0,0 +1,27 @@
+module Roger
+  module Helpers
+    # Helper to include the get_files method
+    module GetFiles
+      # Get files from a path, skipping excludes.
+      #
+      # @param [Array] globs an array of file path globs that will be globbed
+      #                against the project path
+      # @param [Array] excludes an array of regexps[!] that will be excluded
+      #                from the result.
+      # @param [String, Pathname] Path to search files in
+      def get_files(globs, excludes = [], path = nil)
+        path = Pathname.new(get_files_default_path)
+        files = globs.map { |g| Dir.glob(path + g) }.flatten
+        files.reject! { |file| excludes.detect { |e| file.match(e) } } if excludes.any?
+        files.select { |file| File.file?(file) }
+      end
+
+      protected
+
+      # The default path to use when calling get_files
+      def get_files_default_path
+        fail "Implement #get_files_default_path in your class"
+      end
+    end
+  end
+end

data/lib/roger/release/finalizers/rsync.rb

@@ -1,4 +1,5 @@
 require "shellwords"
+require "english"
 
 module Roger::Release::Finalizers
   # Finalizes the release by uploading your mockup with rsync to a remote server
@@ -17,8 +18,8 @@ module Roger::Release::Finalizers
       @options = {
         rsync: "rsync",
         remote_path: "",
-        host: "",
-        username: "",
+        host: nil,
+        username: nil,
         ask: true
       }.update(options)
     end
@@ -52,7 +53,9 @@ module Roger::Release::Finalizers
     end
 
     def rsync(command, local_path, remote_path, options = {})
-      target_path = "#{options[:username]}@#{options[:host]}:#{remote_path}"
+      target_path = remote_path
+      target_path = "#{options[:host]}:#{target_path}" if options[:host]
+      target_path = "#{options[:username]}@#{target_path}" if options[:username]
 
       command = [
         options[:rsync],
@@ -74,7 +77,7 @@ module Roger::Release::Finalizers
     end
 
     def validate_options!(release, options)
-      must_have_keys = [:remote_path, :host, :username]
+      must_have_keys = [:remote_path]
       return if (options.keys & must_have_keys).size == must_have_keys.size
 
       release.log(self, "Missing options: #{(must_have_keys - options.keys).inspect}")

data/lib/roger/release/scm/git.rb

@@ -1,4 +1,5 @@
 require "pathname"
+require "english"
 
 module Roger
   class Release

data/lib/roger/release.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + "/cli"
 require File.dirname(__FILE__) + "/helpers/get_callable"
+require File.dirname(__FILE__) + "/helpers/get_files"
 require File.dirname(__FILE__) + "/helpers/logging"
 
 require "shellwords"
@@ -8,6 +9,7 @@ module Roger
   # The release runner
   class Release
     include Roger::Helpers::Logging
+    include Roger::Helpers::GetFiles
 
     attr_reader :config, :project
 
@@ -200,19 +202,12 @@ module Roger
       project.mode = nil
     end
 
-    # @param [Array] globs an array of file path globs that will be globbed against the build_path
-    # @param [Array] excludes an array of regexps that will be excluded from the result
-    def get_files(globs, excludes = [])
-      files = globs.map { |g| Dir.glob(build_path + g) }.flatten
-      if excludes.any?
-        files.reject { |c| excludes.detect { |e| e.match(c) } }
-      else
-        files
-      end
-    end
-
     protected
 
+    def get_files_default_path
+      build_path
+    end
+
     def default_banner
       banner = [
         "Version : #{scm.version}",

data/lib/roger/test.rb

@@ -1,5 +1,6 @@
 require "thor"
 require File.dirname(__FILE__) + "/helpers/get_callable"
+require File.dirname(__FILE__) + "/helpers/get_files"
 require File.dirname(__FILE__) + "/helpers/logging"
 
 module Roger
@@ -25,6 +26,7 @@ module Roger
     end
 
     include Roger::Helpers::Logging
+    include Roger::Helpers::GetFiles
 
     attr_reader :config, :project
 
@@ -99,25 +101,12 @@ module Roger
       end
     end
 
-    # Get files from the project path
-    #
-    # @param [Array] globs an array of file path globs that will be globbed
-    #                against the project path
-    # @param [Array] excludes an array of regexps[!] that will be excluded
-    #                from the result. N.b. please add an exclamation mark
-    #                if you wasted more then an hour of your life because the
-    #                shell glob didn't 'work'.
-    def get_files(globs, excludes = [])
-      files = globs.map { |g| Dir.glob(project.path + g) }.flatten
-      if excludes.any?
-        files.reject { |c| excludes.detect { |e| c.match(e) } }
-      else
-        files
-      end
-    end
-
     protected
 
+    def get_files_default_path
+      project.path
+    end
+
     def call_test(task)
       if task.is_a?(Array)
         task[0].call(self, task[1])

data/lib/roger/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module Roger
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/unit/helpers/get_files_test.rb

@@ -0,0 +1,76 @@
+require "test_helper"
+require "test_construct"
+require "./lib/roger/helpers/get_files"
+
+# Empty class that uses getfiles
+# This is outside of the Roger namespace by design.
+class MyGetFiles
+  include TestConstruct::Helpers
+  include Roger::Helpers::GetFiles
+
+  attr_accessor :construct
+
+  def initialize
+    @construct = setup_construct
+  end
+
+  def destroy
+    teardown_construct(construct)
+  end
+
+  protected
+
+  def get_files_default_path
+    construct
+  end
+end
+
+module Roger
+  # Test GetFiles module
+  class GetFilesTest < ::Test::Unit::TestCase
+    def setup
+      @object = MyGetFiles.new
+
+      files = [
+        "a.js",
+        "1.js",
+        "1.html",
+        "dir/2.js",
+        "dir/3.js",
+        "dir/subdir/4.js"
+      ]
+
+      @files = files.map do |file|
+        @object.construct.file(file).to_s
+      end
+    end
+
+    def teardown
+      @object.destroy
+    end
+
+    def test_glob
+      files = @object.get_files(["**/*.js"])
+      expect = @files.grep(/\.js\Z/)
+      assert_array_contains(expect, files)
+    end
+
+    def test_get_only_files
+      dir = @object.construct.directory "evil.js"
+      files = @object.get_files(["*.js"])
+      assert_not_include files, dir.to_s
+    end
+
+    def test_excludes
+      files = @object.get_files(["**/*.js"], ["\Adir"])
+      expect = @files.grep(/\.js\Z/).reject { |f| f =~ /\Adir/ }
+      assert_array_contains(expect, files)
+    end
+
+    protected
+
+    def assert_array_contains(expect, result)
+      assert expect.size == result.size && expect & result == expect
+    end
+  end
+end

data/test/unit/release/finalizers/rsync_test.rb

@@ -0,0 +1,52 @@
+require "test_helper"
+require "roger/testing/mock_release"
+
+module Roger
+  # Test for Roger Rsync finalizer
+  class RsyncTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+
+    def setup
+      @release = Testing::MockRelease.new
+
+      # Create a file to release in the build dir
+      @release.project.construct.file "build/index.html"
+
+      # Set fixed version
+      @release.scm.version = "1.0.0"
+
+      # A target dir
+      @target_path = setup_construct(chdir: false)
+    end
+
+    # called after every single test
+    def teardown
+      teardown_construct(@target_path)
+      @release.destroy
+      @release = nil
+    end
+
+    def test_basic_functionality
+      finalizer = Roger::Release::Finalizers::Rsync.new(
+        remote_path: @target_path.to_s,
+        ask: false
+      )
+
+      finalizer.call(@release)
+
+      assert File.exist?(@target_path + "index.html"), @release.target_path.inspect
+    end
+
+    def test_rsync_command_works
+      finalizer = Roger::Release::Finalizers::Rsync.new(
+        rsync: "rsync-0123456789", # Let's hope nobody actually has this command
+        remote_path: @target_path.to_s,
+        ask: false
+      )
+
+      assert_raise(RuntimeError) do
+        finalizer.call(@release)
+      end
+    end
+  end
+end

data/test/unit/test_test.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require "test_helper"
 require "./lib/roger/test.rb"
+require "roger/testing/mock_project"
 
 module Roger
   # Testing the Roger Test fucntionality
@@ -8,12 +9,20 @@ module Roger
     def setup
       @files = ["html/javascripts/site.js",
                 "html/vendor/underscore/underscore.js"]
-      @globs = stub(map: @files)
 
-      @project = Project.new(File.dirname(__FILE__) + "/../project", mockupfile_path: false)
+      @project = Testing::MockProject.new
+
+      @files.each do |file|
+        @project.construct.file file
+      end
+
       @mockupfile = Roger::Mockupfile.new(@project)
     end
 
+    def teardown
+      @project.destroy
+    end
+
     def test_test_run_should_set_project_mode
       assert_equal @project.mode, nil
 
@@ -26,16 +35,5 @@ module Roger
       @project.test.run!
       assert_equal @project.mode, nil
     end
-
-    def test_get_files
-      test = Roger::Test.new({})
-      assert_equal(test.get_files(@globs), @files)
-    end
-
-    def test_get_files_excludes
-      test = Roger::Test.new({})
-      assert_equal(test.get_files(@globs, ["html\/vendor\/.+.js"]),
-                   ["html/javascripts/site.js"])
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
@@ -86,98 +86,98 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: test_construct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: See homepage for more information.
@@ -190,10 +190,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .hound.yml
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT_LICENSE
@@ -226,6 +226,7 @@ files:
 - lib/roger/generators/new.rb
 - lib/roger/generators/templates/generator.tt
 - lib/roger/helpers/get_callable.rb
+- lib/roger/helpers/get_files.rb
 - lib/roger/helpers/logging.rb
 - lib/roger/mockupfile.rb
 - lib/roger/project.rb
@@ -295,10 +296,12 @@ files:
 - test/unit/cli/cli_test_test.rb
 - test/unit/cli/cli_version_test.rb
 - test/unit/generators_test.rb
+- test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb
 - test/unit/rack/roger_test.rb
 - test/unit/release/cleaner_test.rb
 - test/unit/release/finalizers/git_branch_test.rb
+- test/unit/release/finalizers/rsync_test.rb
 - test/unit/release/finalizers/zip_test.rb
 - test/unit/release/processors/mockup_test.rb
 - test/unit/release/processors/url_relativizer_test.rb
@@ -316,22 +319,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
@@ -378,10 +381,12 @@ test_files:
 - test/unit/cli/cli_test_test.rb
 - test/unit/cli/cli_version_test.rb
 - test/unit/generators_test.rb
+- test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb
 - test/unit/rack/roger_test.rb
 - test/unit/release/cleaner_test.rb
 - test/unit/release/finalizers/git_branch_test.rb
+- test/unit/release/finalizers/rsync_test.rb
 - test/unit/release/finalizers/zip_test.rb
 - test/unit/release/processors/mockup_test.rb
 - test/unit/release/processors/url_relativizer_test.rb