roger 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16132ae1857a2fc40e046c297848b5f3683dd249
-  data.tar.gz: b82228479d276c41069da98f8bf473a0f5478a85
+SHA256:
+  metadata.gz: 69986cc9095a927deaa4d0c24ded5939d2ed1ea5373a2e3646af631bf0601c50
+  data.tar.gz: e2fa26c7a1aed9f93fa55b236acbbd7ecece390c615978c3bf3cc5867621743a
 SHA512:
-  metadata.gz: d5f59c20f09f5cbab909ceaa865c1f6b1d6bdac61c863bf9e3e3df6c549c4d0effd212d379a9e215d09a41d32e5e83f8269ece9f423194b6e95f83c0db57a81c
-  data.tar.gz: 54ddecc3563773870ee17ae3c0e712e180f0f6b4969a83ff8fa5afd17055e7fd00fb1598f2723317a58291cc1a09ab3b47cde23947d7e797d3e13a479f886769
+  metadata.gz: 43991d9924c031c0ffae6f413d4a32186c09ad5e4fd64187ca528b97f227b3fa7db5f47476d4b2667900a83516bb20cbcd973165b3cf98b814f06afeb582753d
+  data.tar.gz: 87cb05672e3960e1c8ca8622af06bcf360e0ddebe73d56ce81a6b3122bacf8d7eff4ec9972bec9fdfe35f2e5e1c4cfbbbaf53f902ac20c3fa508d181b404a9e3

data/.rubocop.yml

@@ -1,3 +1,7 @@
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%w": "()"
+
 LineLength:
   Description: 'Limit lines to 100 characters.'
   Max: 100
@@ -18,10 +22,16 @@ Metrics/MethodLength:
 Metrics/AbcSize:
   Max: 20
 
+Metrics/BlockLength:
+  Max: 35
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
   Enabled: false
 
+Style/SymbolArray:
+  Enabled: false
+
 # By default, the rails cops are not run. Override in project or home
 # directory .rubocop.yml files, or by giving the -R/--rails option.
 Rails:

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.3.3
+  - 2.3.7
+  - 2.5.1
+  - ruby-head
 before_script:
   - git config --global user.email "travis-ci@digitpaint.nl"
   - git config --global user.name "Travis-CI"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 1.9.0
+* Render all *.erb files by default
+* Update dependencies
+* Rsync finalizer now uses `--delete`
+* Removed hpricot dependency and URL relativizer (now lives in roger_url)relativizer gem)
+
 ## Version 1.8.0
 * Roger Rack application now adheres to match/skip options. Pass them in the rogerfile as follows:
     ```

data/lib/roger/generators.rb

@@ -12,10 +12,12 @@ module Roger
     def self.register(name, klass = nil)
       name, klass = generator_name(name, klass)
 
-      raise(
-        ArgumentError,
-        "Generator name '#{name.inspect}' already in use"
-      ) if Cli::Generate.tasks.key?(name)
+      if Cli::Generate.tasks.key?(name)
+        raise(
+          ArgumentError,
+          "Generator name '#{name.inspect}' already in use"
+        )
+      end
 
       usage = "#{name} #{klass.arguments.map(&:banner).join(' ')}"
       long_desc = klass.desc || "Run #{name} generator"

data/lib/roger/rack/roger.rb

@@ -14,7 +14,7 @@ module Roger
 
       def default_options
         {
-          match: ["**/*.{html,md,html.erb}"],
+          match: ["**/*.{html,md,erb}"],
           skip: []
         }
       end

data/lib/roger/release.rb

@@ -235,33 +235,43 @@ module Roger
     # Checks if build path exists (and cleans it up)
     # Checks if target path exists (if not, creates it)
     def validate_paths!
-      if build_path.exist?
-        log self, "Cleaning up previous build \"#{build_path}\""
-        rm_rf(build_path)
-      end
+      ensure_clean_build_path!
+      ensure_existing_target_path!
+    end
 
-      unless target_path.exist?
-        log self, "Creating target path \"#{target_path}\""
-        mkdir target_path
-      end
+    def ensure_clean_build_path!
+      return unless build_path.exist?
+
+      log self, "Cleaning up previous build \"#{build_path}\""
+      rm_rf(build_path)
+    end
+
+    def ensure_existing_target_path!
+      return if target_path.exist?
+
+      log self, "Creating target path \"#{target_path}\""
+      mkdir target_path
     end
 
     # Checks if the project will be runned
-    # If config[:blank] is true it will automatically add UrlRelativizer or Mockup processor
+    # If config[:blank] is true it will automatically add Mockup processor
     def validate_stack!
       return if config[:blank]
 
-      unless find_in_stack(Roger::Release::Processors::Mockup)
-        @stack.unshift([Roger::Release::Processors::Mockup.new, {}])
-      end
+      ensure_mockup_processor_in_stack!
+      ensure_dir_finalizer_in_stack!
+    end
 
-      unless find_in_stack(Roger::Release::Processors::UrlRelativizer)
-        @stack.push([Roger::Release::Processors::UrlRelativizer.new, {}])
-      end
+    def ensure_mockup_processor_in_stack!
+      return if find_in_stack(Roger::Release::Processors::Mockup)
 
-      unless find_in_stack(Roger::Release::Finalizers::Dir)
-        @stack.push([Roger::Release::Finalizers::Dir.new, {}])
-      end
+      @stack.unshift([Roger::Release::Processors::Mockup.new, {}])
+    end
+
+    def ensure_dir_finalizer_in_stack!
+      return if find_in_stack(Roger::Release::Finalizers::Dir)
+
+      @stack.push([Roger::Release::Finalizers::Dir.new, {}])
     end
 
     # Find a processor in the stack

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

@@ -58,7 +58,7 @@ module Roger::Release::Finalizers
         FileUtils.cp_r @release.build_path.to_s + "/.", clone_dir.to_s
 
         commands = [
-          %w(git add . ), # 4. Add all files
+          %w(git add .), # 4. Add all files
           %w(git commit -q -a -m) << "Release #{@release.scm.version}" # 5. Commit
         ]
 

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

@@ -60,6 +60,7 @@ module Roger::Release::Finalizers
       command = [
         options[:rsync],
         "-az",
+        "--delete",
         Shellwords.escape(local_path),
         Shellwords.escape(target_path)
       ]

data/lib/roger/release/injector.rb

@@ -80,11 +80,10 @@ module Roger
       raise ArgumentError, "No :content or :file specified" unless content
 
       if injection[:processor]
-        if tmpl = Tilt[injection[:processor]]
-          (tmpl.new { content }).render
-        else
-          raise ArgumentError, "Unknown processor #{injection[:processor]}"
-        end
+        tmpl = Tilt[injection[:processor]]
+        raise(ArgumentError, "Unknown processor #{injection[:processor]}") unless tmpl
+
+        (tmpl.new { content }).render
       else
         content
       end

data/lib/roger/release/processors.rb

@@ -55,4 +55,3 @@ module Roger::Release::Processors
 end
 
 require File.dirname(__FILE__) + "/processors/mockup"
-require File.dirname(__FILE__) + "/processors/url_relativizer"

data/lib/roger/rogerfile.rb

@@ -15,7 +15,7 @@ module Roger
       # @deprecated Please use roger method instead.
       def mockup
         warn("The use of mockup has been deprecated; please use roger instead")
-        warn("  on #{caller.first}")
+        warn("  on #{caller(0..0).first}")
         roger
       end
 

data/lib/roger/template.rb

@@ -95,7 +95,7 @@ module Roger
       source = source.sub(fm_regex, "")
 
       begin
-        data = (YAML.load(match[1]) || {}).inject({}) do |memo, (k, v)|
+        data = (YAML.safe_load(match[1]) || {}).inject({}) do |memo, (k, v)|
           memo[k.to_sym] = v
           memo
         end

data/lib/roger/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module Roger
-  VERSION = "1.8.0".freeze
+  VERSION = "1.9.0".freeze
 end

data/roger.gemspec

@@ -31,16 +31,15 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency("thor", ["~> 0.19.0"])
-  s.add_dependency("rack", [">= 1.0.0"])
+  s.add_dependency("rack", [">= 2.0.0"])
   s.add_dependency("tilt", ["~> 2.0.1"])
-  s.add_dependency("mime-types", ["~> 2.2"])
-  s.add_dependency("hpricot", ["= 0.8.4"])
+  s.add_dependency("mime-types", ["~> 3.1"])
   s.add_dependency("redcarpet", [">= 3.1.1"])
   s.add_dependency("test_construct", "~> 2.0")
 
   s.add_development_dependency("test-unit", "~> 3.0.0")
   s.add_development_dependency("mocha", "~> 1.1.0")
   s.add_development_dependency("simplecov", "~> 0.10.0")
-  s.add_development_dependency("puma", "~> 3.6.0")
-  s.add_development_dependency("rubocop", "~> 0.38.0")
+  s.add_development_dependency("puma", "~> 3.12.0")
+  s.add_development_dependency("rubocop", "~> 0.49.0")
 end

data/test/project/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
+gem "pry"
+gem "redcarpet"
 gem "roger", path: File.dirname(__FILE__) + "/../../"
 gem "sass"
 gem "yui-compressor"
-gem "redcarpet"
-gem "pry"

data/test/project/Rogerfile

@@ -17,5 +17,4 @@ end
 
 mockup.release do |r|
   r.use :mockup
-  r.use :url_relativizer, :skip => [/non-relative.*/]
-end
+end

data/test/project/lib/tests/noop/lib/cli.rb

@@ -2,7 +2,6 @@ module RogerNoopTest
   # A CLI command for the Noop test. Doesn't do anything
   class Cli < Roger::Test::Cli
     desc "init", "init noop tests"
-    def init
-    end
+    def init; end
   end
 end

data/test/unit/generators/generator_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "test_construct"

data/test/unit/generators/new_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "test_construct"

data/test/unit/generators_test.rb

@@ -41,8 +41,7 @@ module Roger
       assert_includes Cli::Generate.tasks, "mockery"
     end
 
-    def test_cli_help_shows_all_available_generators
-    end
+    def test_cli_help_shows_all_available_generators; end
 
     def test_invoke_mocked_generator
       Roger::Generators.register ::Generators::MockedGenerator

data/test/unit/release_test.rb

@@ -19,9 +19,9 @@ module Roger
 
       # Running a blank release
       @rogerfile.release(blank: true) do |r|
-        r.use proc{|release|
+        r.use(proc { |release|
           assert_equal release.project.mode, :release
-        }
+        })
       end
 
       @project.release.run!
@@ -43,14 +43,6 @@ module Roger
       assert_equal Roger::Release::Processors::Mockup, release.stack.first.first.class
     end
 
-    def test_release_should_add_url_relativizer_by_default
-      release = @rogerfile.release
-      release.run!
-
-      assert !release.stack.empty?
-      assert_equal Roger::Release::Processors::UrlRelativizer, release.stack[-2].first.class
-    end
-
     def test_release_should_add_dir_finalizer_by_default
       release = @rogerfile.release
       release.run!

data/test/unit/renderer/renderer_base_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/renderer.rb"
@@ -120,7 +121,7 @@ module Roger
         # "md.erb" => "html",
         "css.erb" => "css",
         "json.erb" => "json",
-        "js.erb" => "js"
+        "js.erb" => "ecma"
       }
 
       mime_types.each do |ext, ext_out|

data/test/unit/renderer/renderer_content_for_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/renderer.rb"

data/test/unit/renderer/renderer_helper_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/renderer.rb"

data/test/unit/renderer/renderer_layout_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/renderer.rb"

data/test/unit/renderer/renderer_partial_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/template.rb"

data/test/unit/server_test.rb

@@ -36,7 +36,6 @@ module Roger
 
       next_port = @server.send(:free_port_for_host_above, @host, port)
       assert next_port > port
-
     ensure
       s.close
     end
@@ -44,8 +43,7 @@ module Roger
     # Test to see if env["roger.project"] is set
     def test_env_roger_project_is_set
       test = Class.new do
-        def initialize(_app)
-        end
+        def initialize(_app); end
 
         def call(env)
           [200, {}, [env["roger.project"].object_id.to_s]]

data/test/unit/template/template_base_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/template.rb"
@@ -23,7 +24,7 @@ module Roger
 
     def test_render_with_block
       template = Template.new("<%= yield %>", {}, source_path: "test.erb")
-      assert_equal "inner", template.render { "inner" }
+      assert_equal "inner", (template.render { "inner" })
     end
 
     def test_data

data/test/unit/test_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require "test_helper"
 require "./lib/roger/test.rb"
 require "roger/testing/mock_project"
@@ -27,9 +28,9 @@ module Roger
       assert_equal @project.mode, nil
 
       @rogerfile.test do |t|
-        t.use proc{|test|
+        t.use(proc { |test|
           assert_equal test.project.mode, :test
-        }
+        })
       end
 
       @project.test.run!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -158,28 +144,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.49.0
 description: See homepage for more information.
 email:
 - info@digitpaint.nl
@@ -241,7 +227,6 @@ files:
 - lib/roger/release/injector.rb
 - lib/roger/release/processors.rb
 - lib/roger/release/processors/mockup.rb
-- lib/roger/release/processors/url_relativizer.rb
 - lib/roger/release/scm.rb
 - lib/roger/release/scm/fixed.rb
 - lib/roger/release/scm/git.rb
@@ -335,7 +320,6 @@ files:
 - test/unit/release/finalizers/zip_test.rb
 - test/unit/release/injector_test.rb
 - test/unit/release/processors/mockup_test.rb
-- test/unit/release/processors/url_relativizer_test.rb
 - test/unit/release/processors_test.rb
 - test/unit/release/scm/base_test.rb
 - test/unit/release/scm/fixed_test.rb
@@ -372,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
@@ -452,7 +436,6 @@ test_files:
 - test/unit/release/finalizers/zip_test.rb
 - test/unit/release/injector_test.rb
 - test/unit/release/processors/mockup_test.rb
-- test/unit/release/processors/url_relativizer_test.rb
 - test/unit/release/processors_test.rb
 - test/unit/release/scm/base_test.rb
 - test/unit/release/scm/fixed_test.rb

data/lib/roger/release/processors/url_relativizer.rb

@@ -1,74 +0,0 @@
-require "hpricot"
-require File.dirname(__FILE__) + "../../../resolver"
-
-module Roger::Release::Processors
-  # URL relativizer processor
-  # The relativizer can be used to rewrite absolute paths in attributes to relative paths
-  # during release.
-  class UrlRelativizer < Base
-    self.name = :url_relativizer
-
-    def default_options
-      {
-        url_attributes: %w(src href action),
-        match: ["**/*.html"],
-        skip: []
-      }
-    end
-
-    def perform
-      log_call
-
-      @resolver = Roger::Resolver.new(release.build_path)
-
-      relativize_attributes_in_files(
-        release,
-        options[:url_attributes],
-        release.get_files(options[:match], options[:skip])
-      )
-    end
-
-    protected
-
-    def log_call
-      log_message = "Relativizing all URLS in #{@options[:match].inspect}"
-      log_message << "files in attributes #{@options[:url_attributes].inspect},"
-      log_message << "skipping #{@options[:skip].any? ? @options[:skip].inspect : 'none'}"
-      release.log(self, log_message)
-    end
-
-    def relativize_attributes_in_files(release, attributes, files)
-      files.each do |file_path|
-        release.debug(self, "Relativizing URLS in #{file_path}") do
-          relativize_attributes_in_file(release, attributes, file_path)
-        end
-      end
-    end
-
-    def relativize_attributes_in_file(release, attributes, file_path)
-      orig_source = File.read(file_path)
-      File.open(file_path, "w") do |f|
-        f.write(relativize_attributes_in_source(release, attributes, orig_source, file_path))
-      end
-    end
-
-    def relativize_attributes_in_source(release, attributes, source, file_path)
-      doc = Hpricot(source)
-      attributes.each do |attribute|
-        (doc / "*[@#{attribute}]").each do |tag|
-          converted_url = @resolver.url_to_relative_url(tag[attribute], file_path)
-          release.debug(self, "Converting '#{tag[attribute]}' to '#{converted_url}'")
-          case converted_url
-          when String
-            tag[attribute] = converted_url
-          when nil
-            release.log(self, "Could not resolve link #{tag[attribute]} in #{file_path}")
-          end
-        end
-      end
-      doc.to_original_html
-    end
-  end
-end
-
-Roger::Release::Processors.register(Roger::Release::Processors::UrlRelativizer)

data/test/unit/release/processors/url_relativizer_test.rb

@@ -1,35 +0,0 @@
-require "test_helper"
-require "roger/testing/mock_release"
-
-module Roger
-  # Test UrlRelativizer
-  class UrlRelativizerTest < ::Test::Unit::TestCase
-    def setup
-      @release = Testing::MockRelease.new
-      @processor = Roger::Release::Processors::UrlRelativizer.new
-    end
-
-    def teardown
-      @release.destroy
-      @release = nil
-    end
-
-    def test_empty_release_runs
-      files = @processor.call(@release)
-      assert_equal 0, files.length
-    end
-
-    def test_basic_relativization
-      @release.project.construct.directory "build/sub" do |dir|
-        dir.file "test.html", "<a href='/test.html'>link</a>"
-      end
-      @release.project.construct.file "build/test.html"
-
-      files = @processor.call(@release)
-      assert_equal 2, files.length
-
-      contents = File.read((@release.build_path + "sub/test.html").to_s)
-      assert contents.include?("../test.html")
-    end
-  end
-end