middleman-targets 1.0.9 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 975177279a3e98636919b394847a1af31f579b39
-  data.tar.gz: 29caf9197870aafd74382861a4a5d12de40a2acc
+SHA256:
+  metadata.gz: cb02e92d39a13a889f07140a0c5d533e9121cd05b9bc926834a85fe48b3ee20b
+  data.tar.gz: 1835a89bda0a07970cb16a056a78abd4b29372011f053450c7c65693c3a31c1e
 SHA512:
-  metadata.gz: 2cc7c466e91ffe211dc3cd052867f7cabc184eb2ce34d5ae80df0f9443fe2eb3435001ca09fc97db8cb298baff8cf725b0f6a60f0fa8e8ea82dca4fa9297d5e7
-  data.tar.gz: 8bd7698eff16fb6da34463a92285bd02e37f20f3d22a6f25a98b619601467c19fc67798b0b5ffa4d8c9a82b30c60f22c2878b82f4e8cff53aa54890f1f90ebef
+  metadata.gz: 8c65bf427c09d109820c9629056d5c3f70835f49a3ee8361180a4abad88694e661c6c18bed9934260aa9993f018fc18e71cec10bf9e694cd8791b27939d7f123
+  data.tar.gz: 35860a43cf487b9cb3aa87816104df8f5d08f27acd0d6aa7d65ccb6ab914b2fc6cbc89fa3ee802ac01bcbcc3e9ae60995a6623b41ac4b495bb8b0b324592b83f

data/.gitattributes

@@ -0,0 +1,4 @@
+*.html linguist-documentation
+*.css linguist-documentation
+*.erb linguist-documentation
+*.js linguist-documentation

data/CHANGELOG.md

@@ -1,12 +1,46 @@
 middleman-targets change log
 ============================
 
+- Version 1.0.14 / 2021-April-12
+
+  - Updated Ruby version requirements to make it clear that Ruby 3.0+ is not yet
+    supported.
+    Updated test task so that default task doesn't use the noisy version with deprecation
+    warnings, and to remove the advertisement at the end of output.
+  - Added .gitattributes for proper language reporting in GitHub.
+    No version bump.
+    No new gem.
+
+- Version 1.0.13 / 2018-December-09
+
+  - Bump version to 1.0.13.
+  - Merge pull request #2 from liscio/master
+    Add per-target overrides for :http_prefix
+  - Add per-target overrides for :http_prefix
+    This allows us to build targets that are served at different paths on
+    the same web server.
+
+- Version 1.0.12 / 2018-June-09
+
+  - Fix (again) the stupid list_all.
+
+- Version 1.0.11 / 2018-June-08
+
+  - Changed list_all for compatibility with other gems.
+
+- Version 1.0.10 / 2018-June-07
+
+  - Bump to version 1.0.10, because list_all command line option was added.
+
 - Version 1.0.9 / 2018-May-26
 
   - Updated to 1.0.9.
      - Update documentation.
      - Fix broken template.
      - Made a testq (quiet) task.
+
+- Version 1.0.8 / 2018-May-18
+
   - Added middleman_target exposed to config.rb
 
 - Version 1.0.7 / 2016-May-15

data/Rakefile

@@ -17,11 +17,11 @@ task :default => :test
 #   Perform Cucumber testing.
 ###############################################################################
 Cucumber::Rake::Task.new(:test, 'Features that must pass') do |task|
-  task.cucumber_opts = '--require features --color --tags "not @wip" --strict --format pretty'
+  task.cucumber_opts = '--publish-quiet --require features --color --tags "not @wip" --strict --format pretty 2>/dev/null'
 end
 
-Cucumber::Rake::Task.new(:testq, 'Features that must pass') do |task|
-  task.cucumber_opts = '--require features --color --tags "not @wip" --strict --format pretty 2>/dev/null'
+Cucumber::Rake::Task.new(:testnoisy, 'Features that must pass') do |task|
+  task.cucumber_opts = '--publish-quiet --require features --color --tags "not @wip" --strict --format pretty'
 end
 
 

data/documentation_project/Gemfile

@@ -9,6 +9,6 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw]
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 
 # Middleman Gems
-gem 'middleman-targets', '~> 1.0.9'
-gem 'middleman', '~> 4.1.6'
+gem 'middleman-targets', '~>1.0.12'
+gem 'middleman', ['~> 4.1', '>= 4.1.7']
 gem 'middleman-syntax'

data/documentation_project/config.rb

@@ -103,7 +103,7 @@ helpers do
   end
 
   def product_version
-    '1.0.9'
+    '1.0.14'
   end
 
 end

data/documentation_project/source/partials/_yard_mmtargets_config.erb

@@ -56,6 +56,58 @@ used for build output.</p>
   
 </ul>
 
+</div>
+</div>
+    
+      
+      <span id="config[:http_prefix]=-instance_method"></span>
+      <div class="method_details ">
+  <h3 class="signature " id="config[:http_prefix]=-instance_method">
+  
+    #<strong>config[:http_prefix]=</strong>(value)  &#x21d2; <tt>String</tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    
+  <div class="note notetag">
+    <strong>Note:</strong>
+    <div class='inline'><p>This is a Middleman application level config option.</p>
+</div>
+  </div>
+
+<p>Default prefix for building paths. Used by HTML helpers.</p>
+
+<p>If the <code>http_prefix</code> key is present for any of the <code>config[:targets]</code>,
+they will override this setting.</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>Indicate the HTTP prefix that will be used by
+HTML helpers.</p>
+</div>
+      
+    </li>
+  
+</ul>
+
 </div>
 </div>
     
@@ -235,10 +287,10 @@ that should be substituted, such as <code>all</code>.</p>
   </div>
 
 <p>A hash that defines all of the characteristics of your individual targets.
-The <code>build_dir</code> and <code>features</code> keys in a target have special meanings;
-other keys can be added arbitrarily and helpers can fetch these for you.
-A best practice is to assign the same features to <em>all</em> of your targets and
-toggle them <code>on</code> or <code>off</code> on a target-specific basis.</p>
+The <code>build_dir</code>, ‘http_prefix’, and <code>features</code> keys in a target have special
+meanings; other keys can be added arbitrarily and helpers can fetch these
+for you. A best practice is to assign the same features to <em>all</em> of your
+targets and toggle them <code>on</code> or <code>off</code> on a target-specific basis.</p>
 
 
   </div>
@@ -257,6 +309,7 @@ toggle them <code>on</code> or <code>off</code> on a target-specific basis.</p>
       <span class='lbrace'>{</span>
           <span class='symbol'>:sample_key</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>People who use free versions don\&#39;t drive profits.</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
           <span class='symbol'>:build_dir</span>  <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>build (%s)</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
+          <span class='symbol'>:http_prefix</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>/free</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
           <span class='symbol'>:features</span>   <span class='op'>=&gt;</span>
               <span class='lbrace'>{</span>
                   <span class='symbol'>:feature_advertise_pro</span> <span class='op'>=&gt;</span> <span class='kw'>true</span><span class='comma'>,</span>
@@ -268,6 +321,7 @@ toggle them <code>on</code> or <code>off</code> on a target-specific basis.</p>
       <span class='symbol'>:pro</span> <span class='op'>=&gt;</span>
       <span class='lbrace'>{</span>
           <span class='symbol'>:sample_key</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>You are a valued contributor to our balance sheet!</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
+          <span class='symbol'>:http_prefix</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>/pro</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
           <span class='symbol'>:features</span> <span class='op'>=&gt;</span>
               <span class='lbrace'>{</span>
                   <span class='symbol'>:feature_advertise_pro</span> <span class='op'>=&gt;</span> <span class='kw'>false</span><span class='comma'>,</span>

data/lib/middleman-targets/commands.rb

@@ -4,3 +4,4 @@
 ################################################################################
 
 require_relative 'middleman-cli/build_all'
+require_relative 'middleman-cli/list_all'

data/lib/middleman-targets/extension.rb

@@ -31,16 +31,17 @@ class MiddlemanTargets < ::Middleman::Extension
 
   # @!attribute [rw] config[:targets]=
   # A hash that defines all of the characteristics of your individual targets.
-  # The `build_dir` and `features` keys in a target have special meanings;
-  # other keys can be added arbitrarily and helpers can fetch these for you.
-  # A best practice is to assign the same features to _all_ of your targets and
-  # toggle them `on` or `off` on a target-specific basis.
+  # The `build_dir`, 'http_prefix', and `features` keys in a target have special
+  # meanings; other keys can be added arbitrarily and helpers can fetch these
+  # for you. A best practice is to assign the same features to _all_ of your
+  # targets and toggle them `on` or `off` on a target-specific basis.
   # @example You might define this in your `config.rb` like this:
   #     config[:targets] = {
   #       :free =>
   #           {
   #               :sample_key => 'People who use free versions don\'t drive profits.',
   #               :build_dir  => 'build (%s)',
+  #               :http_prefix => '/free',
   #               :features   =>
   #                   {
   #                       :feature_advertise_pro => true,
@@ -52,6 +53,7 @@ class MiddlemanTargets < ::Middleman::Extension
   #           :pro =>
   #           {
   #               :sample_key => 'You are a valued contributor to our balance sheet!',
+  #               :http_prefix => '/pro',
   #               :features =>
   #                   {
   #                       :feature_advertise_pro => false,
@@ -98,6 +100,16 @@ class MiddlemanTargets < ::Middleman::Extension
   # @note This is a Middleman application level config option.
 
 
+  # @!attribute [rw] config[:http_prefix]=
+  # Default prefix for building paths. Used by HTML helpers.
+  #
+  # If the `http_prefix` key is present for any of the `config[:targets]`,
+  # they will override this setting.
+  # @return [String] Indicate the HTTP prefix that will be used by
+  #   HTML helpers.
+  # @note This is a Middleman application level config option.
+
+
   # @!endgroup
 
 
@@ -120,30 +132,37 @@ class MiddlemanTargets < ::Middleman::Extension
   #############################################################
   def after_configuration
 
-    return if app.config[:exit_before_ready]
-
     app.config[:target] = app.config[:target].downcase.to_sym
     requested_target = app.config[:target]
     valid_targets = app.config[:targets].each_key.collect { |item| item.downcase}
 
+    if (build_dir = app.config[:targets][app.config[:target]][:build_dir])
+      app.config[:build_dir] = sprintf(build_dir, requested_target)
+    else
+      app.config[:build_dir] = "#{app.config[:build_dir]} (#{requested_target})"
+    end
+
     if valid_targets.count < 1
       say 'middleman-targets is activated but there are no targets specified in your', :red
       say 'configuration file.', :red
       exit 1
     end
 
+    return if app.config[:exit_before_ready]
+
+
     if valid_targets.include?(requested_target)
 
       if app.config[:mode] == :server
         say "Middleman will serve using target \"#{requested_target}\".", :blue
       else
-        if (build_dir = app.config[:targets][app.config[:target]][:build_dir])
-          app.config[:build_dir] = sprintf(build_dir, requested_target)
-        else
-          app.config[:build_dir] = "#{app.config[:build_dir]} (#{requested_target})"
-        end
         say "Middleman will build using target \"#{requested_target}\".", :blue
         say "Build directory is \"#{app.config[:build_dir]}\".", :blue
+
+        if (http_prefix = app.config[:targets][app.config[:target]][:http_prefix])
+          app.config[:http_prefix] = http_prefix
+          say "Using http_prefix \"#{app.config[:http_prefix]}\".", :blue
+        end
       end
 
     else

data/lib/middleman-targets/middleman-cli/build_all.rb

@@ -40,7 +40,7 @@ module Middleman::Cli
 
     end
 
-    Base.register(self, 'build_all', 'build-all', 'Builds all targets')
+    Base.register(self, 'build_all', 'build_all', 'Builds all targets')
     Base.map('all' => 'build_all')
 
   end # class BuildAll

data/lib/middleman-targets/middleman-cli/list_all.rb

@@ -0,0 +1,46 @@
+require 'middleman-cli'
+
+################################################################################
+# Envelops the class necessary to provide the `list_all` command.
+################################################################################
+module Middleman::Cli
+
+  ###################################################################
+  # class Middleman::Cli::ListAll
+  #  List all targets.
+  ###################################################################
+  class ListAll < Thor::Group
+    include Thor::Actions
+    check_unknown_options!
+
+    ############################################################
+    # List all targets.
+    # @return [Void]
+    ############################################################
+    def list_all
+      # Determine the valid targets.
+      app = ::Middleman::Application.new do
+        config[:exit_before_ready] = true
+      end
+      app_config = app.config.clone
+      app.shutdown!
+      
+      # Because after_configuration won't run again until we
+      # build, we'll fake the strings with the one given for
+      # the default. So for each target, gsub the target for
+      # the initial target already given in config.
+      app_config[:targets].each do |target|
+        target_org = app_config[:target].to_s
+        target_req = target[0].to_s
+        path_org = app_config[:build_dir]
+        path_req = path_org.reverse.sub(target_org.reverse, target_req.reverse).reverse
+        say "#{target_req}, #{File.expand_path(path_req)}", :cyan
+      end        
+    end
+    
+    Base.register(self, 'list_all', 'list_all', 'Lists all targets')
+
+  end # class ListAll
+
+end # Module Middleman::Cli
+

data/lib/middleman-targets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemanTargets
-        VERSION = '1.0.9'
+        VERSION = '1.0.14'
     end
 end

data/middleman-targets.gemspec

@@ -2,23 +2,40 @@
 $:.push File.expand_path('../lib', __FILE__)
 require 'middleman-targets/version'
 
-mm_needed = ['~> 4.1', '>= 4.1.7']
+# We should work with any 4.3.x version of Middleman, but due to #2319,
+# automatic image alt attributes have been removed from Middleman, so
+# I'm adjusting the minimum requirement to the first release incorporating
+# that change.
+
+mm_needed = ['~> 4.3.0', '>= 4.3.7']
+
+# We should work with any 2.0 version of Ruby, but I'm no longer testing them
+# for regressions. Version 2.6.0 goes back to December 2018, and is a suitable
+# minimum version.
+#
+# Currently no released version of Middleman works with Ruby 3, so until that is
+# resolved, We will only support 2.6 up to and not including Ruby 3.0.
+
+rb_needed = ['~> 2.0', '>= 2.6']
+
 
 Gem::Specification.new do |s|
-  s.name        = 'middleman-targets'
-  s.version     = Middleman::MiddlemanTargets::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Jim Derry']
-  s.email       = ['balthisar@gmail.com']
-  s.homepage    = 'https://github.com/middlemac/middleman-targets'
-  s.summary     = 'Provides multiple build targets and tools for Middleman.'
-  s.description = 'Provides multiple build targets and tools for Middleman.'
-  s.license     = 'MIT'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+
+  s.required_ruby_version = rb_needed
+  s.name                  = 'middleman-targets'
+  s.version               = Middleman::MiddlemanTargets::VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ['Jim Derry']
+  s.email                 = ['balthisar@gmail.com']
+  s.homepage              = 'https://github.com/middlemac/middleman-targets'
+  s.summary               = 'Provides multiple build targets and tools for Middleman.'
+  s.description           = 'Provides multiple build targets and tools for Middleman.'
+  s.license               = 'MIT'
+
+  s.files                 = `git ls-files`.split("\n")
+  s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths         = ['lib']
   
   # The version of middleman-core your extension depends on
   s.add_runtime_dependency('middleman-core', mm_needed)
@@ -32,4 +49,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',      '>= 10.3'
   s.add_development_dependency 'git'
   s.add_development_dependency 'capybara', ['~> 2.5.0']
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-targets
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.14
 platform: ruby
 authors:
 - Jim Derry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: middleman-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.7
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
@@ -196,6 +197,7 @@ files:
 - lib/middleman-targets/commands.rb
 - lib/middleman-targets/extension.rb
 - lib/middleman-targets/middleman-cli/build_all.rb
+- lib/middleman-targets/middleman-cli/list_all.rb
 - lib/middleman-targets/version.rb
 - middleman-targets.gemspec
 - yard/readme.md
@@ -211,24 +213,26 @@ homepage: https://github.com/middlemac/middleman-targets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
+  - - "~>"
+    - !ruby/object:Gem::Version
+      version: '2.0'
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Provides multiple build targets and tools for Middleman.
 test_files: