roger 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254dec98111150e5adbe9e84f7aa1f46c66f5531
-  data.tar.gz: a5dc918ad5089d30ca4e05cc33d2cd9c5add57eb
+  metadata.gz: 513655e105f751dca8bbc543a7256b732aeb511b
+  data.tar.gz: e9d571bfed7a5daa925441689eee296e489cd64c
 SHA512:
-  metadata.gz: 40834adf5d70b5935c8a783b962a34c59e4a74103db5f39bb13cc3805b28924535acf16abb1cc56c4c1c4998247894eeeb01825907ffac61ac432150aabb2369
-  data.tar.gz: 39fbb668e16cfa3d6c082325a167c6e6ab357feea2276ceca8fb5cae40f799998f5a7c1b1b4a3fe4f95dfe5a0514fcd904dbf2bdc2401d860d248f1d406b3c88
+  metadata.gz: 91fb6db2902cf5c9aa25a95d30c5ad2cb75bcb701d04fdddaa182c2544f0d4d2af2cc7c020398c960e51fdbc8774407a2b8b1b6679184f961ad471485ca95cd3
+  data.tar.gz: 60cda336208d541df3bdd447343a0a46a87feab919c84c55c70a5ac9b2c8cfeeab4d3ef931f64fc1f025195538e90de1cf6ebcb75a6f70dd6ced94d656e9cb03

data/.rubocop.yml

@@ -24,8 +24,8 @@ Style/ClassAndModuleChildren:
 
 # By default, the rails cops are not run. Override in project or home
 # directory .rubocop.yml files, or by giving the -R/--rails option.
-AllCops:
-  RunRailsCops: false
+Rails:
+  Enabled: false
 
 # Disabled cops
 Metrics/ClassLength:
@@ -44,4 +44,4 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Style/SingleLineBlockParams:
-  Enabled: false
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 1.7.1
+* Allow setting defaults per template extension.
+* Minor fixes
+
 ## Version 1.7.0
 * Finalizers and processors now use the same stack. This means you can run processors after certain finalizers
 * Finalizers and processors now have exactly the same API
@@ -268,4 +272,4 @@ There should be no breaking changes between 0.12.5 and 0.13.0
 * Replace CLI "generate" command with "new" subcommand and add support for remote git skeletons based on Thor templating.
 * Add most simple mockup directory as default_template
 * Requirejs processor updated so it will search for a global r.js command, a local npm r.js command and a vendored r.js command
-* Minor fixes and changes
+* Minor fixes and changes

data/doc/templating.md

@@ -73,10 +73,14 @@ Layout (after)
 ```
 
 ### Default layout
-It is possible to define a global default layout in the Rogerfile. 
+It is possible to define a global default layout per template extension in the Rogerfile. 
 
 ```
-roger.project.options[:renderer][:layout] = "my_default_layout"
+roger.project.options[:renderer][:layout] = {
+  "html.erb" => "my_default_layout",
+  "md.erb" => "my_markdown_layout",
+  "md" => "my_markdown_layout"
+}
 ```
 
 The layout can of course be overwritten in the frontmatter. Setting an empty layout will disable the default layout.

data/lib/roger/cli/serve.rb

@@ -19,7 +19,7 @@ module Roger
     end
 
     def start
-      server  = @project.server
+      server = @project.server
 
       @project.server.run! do |server_instance|
         puts "Running Roger with #{server.used_handler.inspect}"

data/lib/roger/cli/test.rb

@@ -9,8 +9,6 @@ module Roger
 
     desc "all", "Run all tests defined in Rogerfile. (this is the default action)"
     def all
-      # If we use fail here the test breaks; no idea why
-      # rubocop:disable Style/SignalException:
       raise(Thor::Error, "Test failed") unless Cli::Base.project.test.run!
     end
   end

data/lib/roger/generators.rb

@@ -12,13 +12,13 @@ module Roger
     def self.register(name, klass = nil)
       name, klass = generator_name(name, klass)
 
-      fail(
+      raise(
         ArgumentError,
         "Generator name '#{name.inspect}' already in use"
       ) if Cli::Generate.tasks.key?(name)
 
       usage = "#{name} #{klass.arguments.map(&:banner).join(' ')}"
-      long_desc =  klass.desc || "Run #{name} generator"
+      long_desc = klass.desc || "Run #{name} generator"
 
       Cli::Generate.register klass, name, usage, long_desc
       Cli::Generate.tasks[name].options = klass.class_options if klass.class_options
@@ -31,7 +31,7 @@ module Roger
         klass = name
         name = klass.to_s.sub(/Generator$/, "").sub(/^.*Generators::/, "").downcase
       else
-        fail ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
+        raise ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
       end
 
       [name.to_s, klass]

data/lib/roger/generators/new.rb

@@ -57,7 +57,7 @@ class Roger::Generators::NewGenerator < Thor::Group
   def git_clone_template(template)
     tmp_dir = temp_directory
 
-    if run("git clone --depth=1 #{Shellwords.escape(template)} #{tmp_dir}")
+    if run("git clone -q --depth=1 #{Shellwords.escape(template)} #{tmp_dir}")
       say "Cloned template from #{template}"
       run("rm -rf #{tmp_dir + '.git'}")
       @cleanup << tmp_dir.to_s

data/lib/roger/helpers/get_callable.rb

@@ -21,7 +21,7 @@ module Roger
           error_message = "Could not resolve #{callable.inspect}. Callable must"
           error_message << "be an object that responds to #call or a symbol that resolve"
           error_message << "to such an object or a class with a #call instance method."
-          fail ArgumentError, error_message
+          raise ArgumentError, error_message
         end
       end
     end

data/lib/roger/helpers/get_files.rb

@@ -20,7 +20,7 @@ module Roger
 
       # The default path to use when calling get_files
       def get_files_default_path
-        fail "Implement #get_files_default_path in your class"
+        raise "Implement #get_files_default_path in your class"
       end
     end
   end

data/lib/roger/helpers/logging.rb

@@ -2,8 +2,8 @@ module Roger
   module Helpers
     # Helper module for logging
     module Logging
-      GRAY = "\e[37m"
-      RED  = "\e[31m"
+      GRAY = "\e[37m".freeze
+      RED  = "\e[31m".freeze
 
       # Write out a log message
       def log(part, msg, verbose = false, &block)

data/lib/roger/helpers/registration.rb

@@ -19,8 +19,8 @@ module Roger
 
         type = to_s.split("::").last
 
-        fail ArgumentError, "#{type} name '#{name.inspect}' already in use" if map.key?(name)
-        fail ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
+        raise ArgumentError, "#{type} name '#{name.inspect}' already in use" if map.key?(name)
+        raise ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
 
         map[name] = processor
       end

data/lib/roger/project.rb

@@ -66,8 +66,8 @@ module Roger
     def partial_path=(p)
       @partial_path = single_or_multiple_paths(p)
     end
-    alias_method :partials_path, :partial_path
-    alias_method :partials_path=, :partial_path=
+    alias partials_path partial_path
+    alias partials_path= partial_path=
 
     def layouts_path=(p)
       @layouts_path = single_or_multiple_paths(p)

data/lib/roger/release.rb

@@ -80,7 +80,7 @@ module Roger
       when :fixed
         @_scm = Release::Scm::Fixed.new
       else
-        fail "Unknown SCM #{options[:scm].inspect}"
+        raise "Unknown SCM #{options[:scm].inspect}"
       end
     end
 
@@ -240,7 +240,7 @@ module Roger
         rm_rf(build_path)
       end
 
-      unless target_path.exist? # rubocop:disable Style/GuardClause
+      unless target_path.exist?
         log self, "Creating target path \"#{target_path}\""
         mkdir target_path
       end
@@ -259,7 +259,6 @@ module Roger
         @stack.push([Roger::Release::Processors::UrlRelativizer.new, {}])
       end
 
-      # rubocop:disable Style/GuardClause
       unless find_in_stack(Roger::Release::Finalizers::Dir)
         @stack.push([Roger::Release::Finalizers::Dir.new, {}])
       end

data/lib/roger/release/cleaner.rb

@@ -36,21 +36,19 @@ module Roger
       begin
         build_path = Pathname.new(build_path).realpath.to_s
         path = Pathname.new(path)
-        if path.absolute?
-          path = path.realpath.to_s
-        else
-          path = Pathname.new(File.join(build_path.to_s, path)).realpath.to_s
-        end
+        path = if path.absolute?
+                 path.realpath.to_s
+               else
+                 Pathname.new(File.join(build_path.to_s, path)).realpath.to_s
+               end
       rescue Errno::ENOENT
         # Real path does not exist
         return false
       end
 
-      if path[build_path]
-        return true
-      else
-        fail "Cleaning pattern is not inside build directory"
-      end
+      raise "Cleaning pattern is not inside build directory" unless path[build_path]
+
+      true
     end
   end
 end

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

@@ -58,8 +58,8 @@ 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 commit -a -m) << "Release #{@release.scm.version}" # 5. Commit
+          %w(git add . ), # 4. Add all files
+          %w(git commit -q -a -m) << "Release #{@release.scm.version}" # 5. Commit
         ]
 
         # 6. Git push if in options
@@ -74,20 +74,20 @@ module Roger::Release::Finalizers
     # Check if remote already has branch
     def remote_has_branch?(remote, branch)
       command = Shellwords.join([
-        "git",
-        "ls-remote",
-        "--heads",
-        remote,
-        "refs/heads/#{branch}"
-      ])
+                                  "git",
+                                  "ls-remote",
+                                  "--heads",
+                                  remote,
+                                  "refs/heads/#{branch}"
+                                ])
       `#{command}` != ""
     end
 
     def create_empty_branch(clone_dir, remote, branch)
       commands = [
-        %w(git init),
+        %w(git init -q),
         %w(git remote add origin) << remote,
-        %w(git checkout -b) << branch
+        %w(git checkout -q -b) << branch
       ]
 
       # Branch does not exist yet
@@ -101,14 +101,14 @@ module Roger::Release::Finalizers
 
     def clone_branch(clone_dir, remote, branch)
       command = Shellwords.join([
-        "git",
-        "clone",
-        remote,
-        "--branch",
-        branch,
-        "--single-branch",
-        clone_dir
-      ])
+                                  "git",
+                                  "clone",
+                                  remote,
+                                  "--branch",
+                                  branch,
+                                  "--single-branch",
+                                  clone_dir
+                                ])
       `#{command}`
     end
 
@@ -122,7 +122,7 @@ module Roger::Release::Finalizers
 
       remote.strip!
 
-      fail "No remote found for origin" if remote.nil? || remote.empty?
+      raise "No remote found for origin" if remote.nil? || remote.empty?
 
       remote
     end

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

@@ -68,7 +68,7 @@ module Roger::Release::Finalizers
       output = `#{command.join(" ")}`
 
       # Check if rsync succeeded
-      fail "Rsync failed.\noutput:\n #{output}" unless $CHILD_STATUS.success?
+      raise "Rsync failed.\noutput:\n #{output}" unless $CHILD_STATUS.success?
     end
 
     def prompt_for_upload
@@ -81,7 +81,7 @@ module Roger::Release::Finalizers
       return if (@options.keys & must_have_keys).size == must_have_keys.size
 
       release.log(self, "Missing options: #{(must_have_keys - @options.keys).inspect}")
-      fail "Missing keys: #{(must_have_keys - @options.keys).inspect}"
+      raise "Missing keys: #{(must_have_keys - @options.keys).inspect}"
     end
 
     def prompt(question = "Do you wish to continue?")

data/lib/roger/release/injector.rb

@@ -56,7 +56,7 @@ module Roger
             injected_vars << variable
           end
         end
-        if injected_vars.size > 0
+        unless injected_vars.empty?
           release.log(self, "Injected variables #{injected_vars.inspect} into #{f}")
         end
         File.open(f, "w") { |fh| fh.write c }
@@ -70,24 +70,20 @@ module Roger
       when Hash
         get_complex_injection(injection, release)
       else
-        if injection.respond_to?(:to_s)
-          injection.to_s
-        else
-          fail ArgumentError, "Woah, what's this? #{injection.inspect}"
-        end
+        injection.to_s
       end
     end
 
     def get_complex_injection(injection, release)
       content = injection_content(injection, release)
 
-      fail ArgumentError, "No :content or :file specified" unless content
+      raise ArgumentError, "No :content or :file specified" unless content
 
       if injection[:processor]
         if tmpl = Tilt[injection[:processor]]
           (tmpl.new { content }).render
         else
-          fail ArgumentError, "Unknown processor #{injection[:processor]}"
+          raise ArgumentError, "Unknown processor #{injection[:processor]}"
         end
       else
         content

data/lib/roger/release/processors.rb

@@ -11,7 +11,7 @@ module Roger::Release::Processors
 
       # Name of this processor
       def name
-        @name || fail(ArgumentError, "Implement in subclass")
+        @name || raise(ArgumentError, "Implement in subclass")
       end
     end
 
@@ -49,7 +49,7 @@ module Roger::Release::Processors
     end
 
     def perform
-      fail ArgumentError, "Implement in subclass"
+      raise ArgumentError, "Implement in subclass"
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Roger::Release::Processors
       "application/xml" => "xml",
       "text/csv" => "csv",
       "application/json" => "json"
-    }
+    }.freeze
 
     def default_options
       {

data/lib/roger/release/scm.rb

@@ -13,19 +13,19 @@ module Roger
         #
         # @return String The current version string
         def version
-          fail "Implement in subclass"
+          raise "Implement in subclass"
         end
 
         # Returns the release version date from the SCM
         def date
-          fail "Implement in subclass"
+          raise "Implement in subclass"
         end
 
         # Returns a Release::Scm object with the previous version's data
         #
         # @return Roger::Release::Scm The previous version
         def previous
-          fail "Implement in subclass"
+          raise "Implement in subclass"
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Roger
 
           path += ".git"
 
-          fail "Could not find suitable .git dir in #{path}" unless path.directory?
+          raise "Could not find suitable .git dir in #{path}" unless path.directory?
 
           path
         end

data/lib/roger/renderer.rb

@@ -183,7 +183,7 @@ module Roger
           (Pathname.new(current_template.source_path).dirname + pn).realpath
         else
           err = "Only within another template you can use relative paths"
-          fail ArgumentError, err
+          raise ArgumentError, err
         end
       else
         pn.realpath
@@ -204,7 +204,11 @@ module Roger
 
     # Gets the layout for a specific template
     def layout_for_template(template, options)
-      layout_name = template.data.key?(:layout) ? template.data[:layout] : options[:layout]
+      layout_name = if template.data.key?(:layout)
+                      template.data[:layout]
+                    else
+                      get_default_layout(template, options)
+                    end
 
       # Only attempt to load layout when:
       # - Template is the toplevel template
@@ -214,6 +218,15 @@ module Roger
       template(layout_name, nil, :layout)
     end
 
+    # Gets the default layout that can be specified by the Rogerfile:
+    # roger.project.options[:renderer][:layout] = {
+    #   "html.erb" => "default"
+    # }
+    def get_default_layout(template, options)
+      source_ext = Renderer.source_extension_for(template.source_path)
+      options[:layout][source_ext] if options.key?(:layout)
+    end
+
     # Will check the template nesting if we haven't already
     # rendered this path before. If it has we'll throw an argumenteerror
     def prevent_recursion!(template)
@@ -230,7 +243,7 @@ module Roger
       err = "Recursive render detected for '#{template.source_path}'"
       err += " in '#{current_template.source_path}'"
 
-      fail ArgumentError, err
+      raise ArgumentError, err
     end
 
     # Will instantiate a Template or throw an ArgumentError
@@ -239,14 +252,14 @@ module Roger
       if source
         template = Template.new(source, @context, source_path: path)
       else
-        case type
-        when :partial
-          template_path = find_partial(path)
-        when :layout
-          template_path = find_layout(path)
-        else
-          template_path = path
-        end
+        template_path = case type
+                        when :partial
+                          find_partial(path)
+                        when :layout
+                          find_layout(path)
+                        else
+                          path
+                        end
 
         if template_path && File.exist?(template_path)
           template = Template.open(template_path, @context)
@@ -263,7 +276,7 @@ module Roger
     def template_not_found!(type, path)
       err = "No such #{type} #{path}"
       err += " in #{@current_template.source_path}" if @current_template
-      fail ArgumentError, err
+      raise ArgumentError, err
     end
 
     # Find a partial

data/lib/roger/resolver.rb

@@ -24,12 +24,12 @@ module Roger
         erubis
         str
       )
-    }
+    }.freeze
 
     attr_reader :load_paths
 
     def initialize(paths)
-      fail ArgumentError, "Resolver base path can't be nil" if paths.nil?
+      raise ArgumentError, "Resolver base path can't be nil" if paths.nil?
 
       # Convert to paths
       @load_paths = [paths].flatten.map { |p| Pathname.new(p) }
@@ -57,7 +57,7 @@ module Roger
 
       output
     end
-    alias_method :url_to_path, :find_template
+    alias url_to_path find_template
 
     # Convert a disk path on file to an url
     def path_to_url(path, relative_to = nil)
@@ -81,7 +81,7 @@ module Roger
       path, qs, anch = strip_query_string_and_anchor(url)
 
       # Get disk path
-      if true_path =  url_to_path(path, exact_match: true)
+      if true_path = url_to_path(path, exact_match: true)
         path = path_to_url(true_path, relative_to_path)
         path += qs if qs
         path += anch if anch
@@ -151,17 +151,17 @@ module Roger
       results = []
 
       files.each do |file|
-        if file.start_with?(path)
-          match = path
-        else
-          match = path_without_extension
-        end
+        match = if file.start_with?(path)
+                  path
+                else
+                  path_without_extension
+                end
 
         processable_extensions = file[(match.length + 1)..-1].split(".")
 
         # All processable_extensions must be processable
         # by a template_extension
-        next unless (processable_extensions - template_extensions).length == 0
+        next unless (processable_extensions - template_extensions).empty?
 
         if file.start_with?(path)
           # The whole path is found in the filename, not just

data/lib/roger/rogerfile.rb

@@ -34,7 +34,7 @@ module Roger
 
     # Actually load the rogerfile
     def load
-      return unless File.exist?(@path) && !self.loaded?
+      return unless File.exist?(@path) && !loaded?
 
       @source = File.read(@path)
       context = Context.new(self)
@@ -59,7 +59,7 @@ module Roger
       server
     end
 
-    alias_method :server, :serve
+    alias server serve
 
     def test(options = {})
       test = project.test(options)

data/lib/roger/server.rb

@@ -91,7 +91,7 @@ module Roger
       @used_port = nil
       @used_handler = nil
     end
-    alias_method :run, :run!
+    alias run run!
 
     def server_options_for_handler
       # Search for available port
@@ -113,11 +113,11 @@ module Roger
     end
 
     def handler=(h)
-      if h.respond_to?(:run)
-        @handler = h
-      else
-        @handler = get_handler(h)
-      end
+      @handler = if h.respond_to?(:run)
+                   h
+                 else
+                   get_handler(h)
+                 end
     end
 
     protected

data/lib/roger/template.rb

@@ -59,11 +59,9 @@ module Roger
       return @_real_source_path if @_real_source_path_cached
 
       @_real_source_path_cached = true
-      if File.exist?(source_path)
-        @_real_source_path = Pathname.new(source_path).realpath
-      else
-        @_real_source_path = nil
-      end
+      @_real_source_path = if File.exist?(source_path)
+                             Pathname.new(source_path).realpath
+                           end
     end
 
     protected
@@ -73,11 +71,11 @@ module Roger
       @current_tilt_template = template_class
       template = template_class.new(source_path) { src }
 
-      if block_given?
-        block_content = yield
-      else
-        block_content = ""
-      end
+      block_content = if block_given?
+                        yield
+                      else
+                        ""
+                      end
 
       template.render(@context, locals) do |name|
         if name
@@ -92,20 +90,18 @@ module Roger
     def extract_front_matter(source)
       fm_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
 
-      if match = source.match(fm_regex)
-        source = source.sub(fm_regex, "")
-
-        begin
-          data = (YAML.load(match[1]) || {}).inject({}) do |memo, (k, v)|
-            memo[k.to_sym] = v
-            memo
-          end
-        rescue *YAML_ERRORS => e
-          puts "YAML Exception: #{e.message}"
-          return false
+      return [{}, source] unless match = source.match(fm_regex)
+
+      source = source.sub(fm_regex, "")
+
+      begin
+        data = (YAML.load(match[1]) || {}).inject({}) do |memo, (k, v)|
+          memo[k.to_sym] = v
+          memo
         end
-      else
-        return [{}, source]
+      rescue *YAML_ERRORS => e
+        puts "YAML Exception: #{e.message}"
+        return false
       end
 
       [data, source]

data/lib/roger/template/helpers/capture.rb

@@ -39,7 +39,7 @@ module Roger
           unless Thread.current[:tilt_current_template].is_a?(Tilt::ERBTemplate)
             err  = "content_for works only with ERB Templates"
             err += "(was: #{template.current_tilt_template.inspect})"
-            fail ArgumentError, err
+            raise ArgumentError, err
           end
 
           @block_counter ||= 0

data/lib/roger/template/helpers/partial.rb

@@ -4,11 +4,11 @@ module Roger
       # The partial helper
       module Partial
         def partial(name, locals = {}, &block)
-          if locals[:locals]
-            options = locals
-          else
-            options = { locals: locals }
-          end
+          options = if locals[:locals]
+                      locals
+                    else
+                      { locals: locals }
+                    end
           if block_given?
             partial_with_block(name, options, &block)
           else

data/lib/roger/test.rb

@@ -21,7 +21,7 @@ module Roger
       desc "test", "Run the test"
       def test
         ok = Roger::Cli::Base.project.test.run_test!(self.class.stack_index)
-        fail(Thor::Error, "The test failed") unless ok
+        raise(Thor::Error, "The test failed") unless ok
       end
     end
 
@@ -37,10 +37,10 @@ module Roger
 
       def register(name, test, cli = nil)
         if map.key?(name)
-          fail ArgumentError, "Another test has already claimed the name #{name.inspect}"
+          raise ArgumentError, "Another test has already claimed the name #{name.inspect}"
         end
 
-        fail ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
+        raise ArgumentError, "Name must be a symbol" unless name.is_a?(Symbol)
         map[name] = test
         cli_map[name] = cli if cli
       end
@@ -122,7 +122,7 @@ module Roger
         usage = "#{name} #{klass.arguments.map(&:banner).join(' ')}"
         thor_class = klass
       else
-        usage = "#{name}"
+        usage = name.to_s
         thor_class = Class.new(Roger::Test::Cli)
       end
 

data/lib/roger/version.rb

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

data/roger.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |s|
   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.31.0")
+  s.add_development_dependency("rubocop", "~> 0.38.0")
 end

data/test/helpers/generators.rb

@@ -8,7 +8,7 @@ module Generators
 
     def test
       # Somewhat ugly way of checking
-      fail NotImplementedError
+      raise NotImplementedError
     end
   end
 
@@ -19,7 +19,7 @@ module Generators
     desc "Returns a project"
     def test
       # Somewhat ugly way of checking
-      fail StandardError if @project
+      raise StandardError if @project
     end
   end
 end

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

@@ -1,9 +1,8 @@
 module RogerNoopTest
-  # A CLI command for the Noop test. Doesn't do anything, just output "initialized"
+  # A CLI command for the Noop test. Doesn't do anything
   class Cli < Roger::Test::Cli
     desc "init", "init noop tests"
     def init
-      puts "initialized"
     end
   end
 end

data/test/unit/cli/cli_release_test.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+require "./lib/roger/cli"
+require "test_construct"
+
+require File.dirname(__FILE__) + "/../../helpers/cli"
+
+module Roger
+  # These tests ar for the roger generate command
+  class CliReleaseTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+    include TestCli
+
+    def setup
+      # Reset project as not to leak from other tests
+      Cli::Base.project = nil
+
+      @base_path = setup_construct
+      @base_path.directory "html" do |h|
+        h.file "index.html"
+      end
+      @base_path.file "Rogerfile", "roger.release(scm: :fixed) { |r| r.scm.version = '1' }"
+    end
+
+    def teardown
+      teardown_construct(@base_path)
+      Cli::Base.project = nil
+    end
+
+    # roger generate
+    def test_has_release_command
+      assert_includes Cli::Base.tasks.keys, "release"
+    end
+
+    def test_runs_release
+      run_command(%w(release))
+      assert File.exist?(@base_path + "releases/html-1")
+    end
+  end
+end

data/test/unit/cli/cli_serve_test.rb

@@ -18,7 +18,7 @@ module Roger
           when Puma::Launcher
             # Most unfortunately we have to do it using an exception because
             # Puma will yield before actually starting the server resulting in failures
-            fail "Stop"
+            raise "Stop"
           else
             server.stop
           end

data/test/unit/generators/generator_test.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+# Generators register themself on the CLI module
+require "test_helper"
+require "test_construct"
+
+require File.dirname(__FILE__) + "/../../helpers/cli"
+
+module Roger
+  # Test Roger Generators
+  class GeneratoGeneratorTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+    include TestCli
+
+    def test_new_generator_exists
+      assert_includes Cli::Generate.tasks, "generator"
+    end
+
+    def test_generator_generator
+      name = "tralal"
+      path = "./tmp"
+
+      within_construct do
+        run_command(%w(generate generator) + [name, path])
+        assert File.exist? "#{path}/#{name}_generator.rb"
+      end
+    end
+  end
+end

data/test/unit/generators/new_test.rb

@@ -0,0 +1,74 @@
+# encoding: UTF-8
+# Generators register themself on the CLI module
+require "test_helper"
+require "test_construct"
+
+require File.dirname(__FILE__) + "/../../helpers/cli"
+
+module Roger
+  # Test Roger Generators
+  class GeneratorNewTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+    include TestCli
+
+    def test_new_generator_exists
+      assert_includes Cli::Generate.tasks, "new"
+    end
+
+    def test_exits_on_existing_dir
+      within_construct do |c|
+        c.directory "existingdir"
+
+        assert_raises(SystemExit) { run_command %w(generate new existingdir) }
+      end
+    end
+
+    def test_with_non_existing_template
+      within_construct do
+        assert_raises(SystemExit) { run_command %w(generate new mydir -t template) }
+      end
+    end
+
+    def test_with_default_template
+      within_construct do
+        run_command %w(generate new mydir)
+
+        assert File.exist?("mydir/Rogerfile")
+        assert File.exist?("mydir/Gemfile")
+        assert File.exist?("mydir/CHANGELOG")
+        assert File.exist?("mydir/.gitignore")
+        assert File.directory?("mydir/html")
+        assert File.directory?("mydir/partials")
+      end
+    end
+
+    def test_with_git_template
+      within_construct do |c|
+        c.directory "template" do |t|
+          system("git init -q")
+          t.file "gitone"
+          system("git add gitone; git commit -q -am 'test'")
+        end
+
+        git_path = "file://#{c + 'template/.git'}"
+        run_command %w(generate new mydir -t) << git_path
+
+        assert File.exist?("mydir/gitone")
+      end
+    end
+
+    def test_with_custom_template
+      within_construct do |c|
+        c.directory "template" do |t|
+          t.file "one"
+          t.file "two"
+        end
+
+        run_command %w(generate new mydir -t template)
+
+        assert File.exist?("mydir/one")
+        assert File.exist?("mydir/two")
+      end
+    end
+  end
+end

data/test/unit/generators_test.rb

@@ -1,12 +1,17 @@
 # Generators register themself on the CLI module
 require "test_helper"
 require "./lib/roger/generators.rb"
+require "test_construct"
 
 require File.dirname(__FILE__) + "/../helpers/generators"
+require File.dirname(__FILE__) + "/../helpers/cli"
 
 module Roger
   # Test Roger Generators
   class GeneratorTest < ::Test::Unit::TestCase
+    include TestConstruct::Helpers
+    include TestCli
+
     def setup
       @cli = Cli::Base.new
 
@@ -39,21 +44,6 @@ module Roger
     def test_cli_help_shows_all_available_generators
     end
 
-    def test_default_generator
-      assert_includes Cli::Generate.tasks, "new"
-    end
-
-    def test_generator_generator
-      generators = Cli::Generate.new
-      name = "tralal"
-      path = "./tmp"
-      generators.invoke :generator, [name, path]
-      assert File.exist? "#{path}/#{name}_generator.rb"
-
-      # Remove generated generator
-      File.unlink "#{path}/#{name}_generator.rb"
-    end
-
     def test_invoke_mocked_generator
       Roger::Generators.register ::Generators::MockedGenerator
 

data/test/unit/helpers/get_files_test.rb

@@ -63,7 +63,7 @@ module Roger
 
     def test_excludes
       files = @object.get_files(["**/*.js"], ["\Adir"])
-      expect = @files.grep(/\.js\Z/).reject { |f| f =~ /\Adir/ }
+      expect = @files.grep(/\.js\Z/).reject { |f| f.start_with?("dir") }
       assert_array_contains(expect, files)
     end
 

data/test/unit/mockupfile_test.rb

@@ -7,7 +7,7 @@ end
 
 module Roger
   # Test Roger Release
-  class ReleaseTest < ::Test::Unit::TestCase
+  class MockupFileTest < ::Test::Unit::TestCase
     def setup
       @project = Testing::MockProject.new
     end

data/test/unit/rack/roger_test.rb

@@ -22,7 +22,9 @@ module Roger
       end
 
       def test_renderer_options_are_passed
-        @project.options[:renderer][:layout] = "bracket"
+        @project.options[:renderer][:layout] = {
+          "html.erb" => "bracket"
+        }
 
         @project.construct.file "layouts/bracket.html.erb", "[<%= yield %>]"
         @project.construct.file "html/test.html.erb", "<%= 'test' %>"

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

@@ -44,10 +44,10 @@ module Roger
       finalizer = Roger::Release::Finalizers::GitBranch.new
       remote_repo = setup_construct(chdir: false)
 
-      `git init`
+      `git init -q`
 
       Dir.chdir(remote_repo.to_s) do
-        `git init --bare`
+        `git init -q --bare`
       end
 
       `git remote add origin #{Shellwords.escape(remote_repo.to_s)}`

data/test/unit/release/injector_test.rb

@@ -30,6 +30,17 @@ module Roger
       assert_equal "a1b", File.read(@target_file.to_s)
     end
 
+    def test_to_s_injection
+      injector = Roger::Release::Injector.new(
+        { "VAR" => 1 },
+        into: ["out"]
+      )
+
+      injector.call(@release)
+
+      assert_equal "a1b", File.read(@target_file.to_s)
+    end
+
     def test_regex_injection
       injector = Roger::Release::Injector.new(
         { /V.R/ => "1" },

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

@@ -45,7 +45,9 @@ module Roger
     end
 
     def test_renderer_options_are_passed
-      @release.project.options[:renderer][:layout] = "bracket"
+      @release.project.options[:renderer][:layout] = {
+        "html.erb" => "bracket"
+      }
       @release.project.construct.file "layouts/bracket.html.erb", "[<%= yield %>]"
       @release.project.construct.directory "build" do |dir|
         dir.file "test.html.erb", "<%= 'test' %>"

data/test/unit/release/processors_test.rb

@@ -15,13 +15,13 @@ module Roger
     end
 
     def test_register_processor
-      processor = ->(_e) { fail "ProcessorName" }
+      processor = ->(_e) { raise "ProcessorName" }
       assert Roger::Release::Processors.register(:name, processor)
       assert_equal Roger::Release::Processors.map, name: processor
     end
 
     def test_register_processor_with_symbol_only_name
-      processor = ->(_e) { fail "ProcessorName" }
+      processor = ->(_e) { raise "ProcessorName" }
 
       assert_raise(ArgumentError) do
         Roger::Release::Processors.register("name", processor)
@@ -33,7 +33,7 @@ module Roger
     end
 
     def test_register_processor_with_same_name
-      processor = ->(_e) { fail "ProcessorName" }
+      processor = ->(_e) { raise "ProcessorName" }
       Roger::Release::Processors.register(:name, processor)
 
       assert_raise(ArgumentError) do
@@ -42,7 +42,7 @@ module Roger
     end
 
     def test_register_processor_with_same_contents
-      processor = ->(_e) { fail "ProcessorName" }
+      processor = ->(_e) { raise "ProcessorName" }
       Roger::Release::Processors.register(:name, processor)
 
       assert_nothing_raised do

data/test/unit/renderer/renderer_layout_test.rb

@@ -43,22 +43,51 @@ module Roger
 
     def test_default_layout
       template = "TEMPLATE"
-      assert_equal "[TEMPLATE]", render_erb_template(template, layout: "bracket")
+      default_layout = {
+        "html.erb" => "bracket"
+      }
+
+      assert_equal "[TEMPLATE]", render_erb_template(template, layout: default_layout)
     end
 
     def test_default_layout_is_overriden_by_frontmatter
       template = "---\nlayout: \"yield\"\n---\nTEMPLATE"
-      assert_equal "TEMPLATE", render_erb_template(template, layout: "bracket")
+      default_layout = {
+        "html.erb" => "bracket"
+      }
+
+      assert_equal "TEMPLATE", render_erb_template(template, layout: default_layout)
     end
 
     def test_default_layout_can_by_disabled_in_frontmatter
       template = "---\nlayout: \n---\nTEMPLATE"
-      assert_equal "TEMPLATE", render_erb_template(template, layout: "bracket")
+      default_layout = {
+        "html.erb" => "bracket"
+      }
+
+      assert_equal "TEMPLATE", render_erb_template(template, layout: default_layout)
+    end
+
+    def test_default__layouts_is_skipped_for_other_extensions_types
+      template = "TEMPLATE"
+      default_layout = {
+        "html.erb" => "bracket"
+      }
+
+      assert_equal "TEMPLATE", render_css_template(template, layout: default_layout)
     end
 
     def render_erb_template(template, options = {})
+      render_abstract_template(@base + "html/layouts/test.html.erb", template, options)
+    end
+
+    def render_css_template(template, options = {})
+      render_abstract_template(@base + "html/layouts/test.css.erb", template, options)
+    end
+
+    def render_abstract_template(filename, template, options)
       options = {}.update(options).update(source: template)
-      @renderer.render(@base + "html/layouts/test.html.erb", options)
+      @renderer.render(filename, options)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -172,14 +172,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: 0.38.0
 description: See homepage for more information.
 email:
 - info@digitpaint.nl
@@ -316,9 +316,12 @@ files:
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli/cli_base_test.rb
 - test/unit/cli/cli_generate_test.rb
+- test/unit/cli/cli_release_test.rb
 - test/unit/cli/cli_serve_test.rb
 - test/unit/cli/cli_test_test.rb
 - test/unit/cli/cli_version_test.rb
+- test/unit/generators/generator_test.rb
+- test/unit/generators/new_test.rb
 - test/unit/generators_test.rb
 - test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb
@@ -368,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
@@ -429,9 +432,12 @@ test_files:
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli/cli_base_test.rb
 - test/unit/cli/cli_generate_test.rb
+- test/unit/cli/cli_release_test.rb
 - test/unit/cli/cli_serve_test.rb
 - test/unit/cli/cli_test_test.rb
 - test/unit/cli/cli_version_test.rb
+- test/unit/generators/generator_test.rb
+- test/unit/generators/new_test.rb
 - test/unit/generators_test.rb
 - test/unit/helpers/get_files_test.rb
 - test/unit/helpers/logging_test.rb