middleman-targets 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deee1c85364e43f1459115ebde84b781d2549fc8
-  data.tar.gz: b7bbac002f75e24910d241191b4879ec98ff169a
+  metadata.gz: ca4461d428b23805b22490d34f982653f8672c5e
+  data.tar.gz: c641ebab71e92cb56268759ce0fb3962032c1e56
 SHA512:
-  metadata.gz: 021a9f30ba4995390ad0a72e2b7074b011f40fb262279a524bd87be05a4db7aa673aabad094ec857f55917bb6c721159292cb781febd87e1c991b96a77339592
-  data.tar.gz: 7d9b66a946ed244634f8a7e6e0116afff6ef4c83c512ce74ba43009bb3fd3107c518aa535971885f38c8f102e7222c1d318dc3e01d4ccba4a3c60ca0a9f2c4d8
+  metadata.gz: 249127f0ac430965e499cd1cb33897e5b49f54167cd42466becd181a502b9b2c3ab26545e88d7be4ee63ef385163c8a6dc7955bda9844ae0ef6d99a004410b3e
+  data.tar.gz: 828add7e1cd36c5ea3e8b63cac842d5869078021f63183cb7d7732aa4eadca1307f1d17d8c3246c3c7fb19c9b18b07796924d1b251fc02af1d0b04d2d761be69

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 middleman-targets change log
 ============================
 
-- Version 1.0.10 / 2018-June-07
+- Version 1.0.11 / 2018-June-08
 
+  - Changed list_all for compatibility with other gems.
   - Bump to version 1.0.10, because list_all command line option was added.
 
 - Version 1.0.9 / 2018-May-26
@@ -16,7 +17,7 @@ middleman-targets change log
 
   - Added middleman_target exposed to config.rb
 
-- Version 1.0.7 / 2016-May-14
+- Version 1.0.7 / 2016-May-15
 
   - Bump to 1.0.7 fixes:
       - Require capybara as development dependency fixes broken testing.

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.10'
+gem 'middleman-targets', '~>1.0.11.wip'
 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.10'
+    '1.0.11'
   end
 
 end

data/lib/middleman-targets/extension.rb

@@ -120,28 +120,30 @@ 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
       end

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

@@ -18,28 +18,43 @@ module Middleman::Cli
     # @return [Void]
     ############################################################
     def list_all
-      # The first thing we want to do is create a temporary application
-      # instance so that we can determine the valid targets.
+
+      # Determine the valid targets.
       app = ::Middleman::Application.new do
         config[:exit_before_ready] = true
       end
-      config = app.config.clone
+      app_config = app.config.clone
       app.shutdown!
 
-      config[:targets].each do |target|
-        out_path = ''
+      # Spin up an instance for each target to get its
+      # output path.
+      app_config[:targets].each do |target|
         requested_target = target[0]
-        if (build_dir = config[:targets][requested_target][:build_dir])
-          out_path = sprintf(build_dir, requested_target.to_s)
-        else
-          out_path = "#{config[:build_dir]} (#{requested_target.to_s})"
+        app = ::Middleman::Application.new do
+          config[:target] = requested_target
+          config[:exit_before_ready] = true
         end
-
-        out_path = File.expand_path(out_path)
-
+        config = app.config.clone
+        app.shutdown!
+        out_path = File.expand_path(config[:build_dir])
         say "#{requested_target.to_s}, #{out_path}", :cyan
-        
       end
+      
+
+#       config[:targets].each do |target|
+#         out_path = ''
+#         requested_target = target[0]
+#         if (build_dir = config[:targets][requested_target][:build_dir])
+#           out_path = sprintf(build_dir, requested_target.to_s)
+#         else
+#           out_path = "#{config[:build_dir]} (#{requested_target.to_s})"
+#         end
+# 
+#         out_path = File.expand_path(out_path)
+# 
+#         say "#{requested_target.to_s}, #{out_path}", :cyan
+#         
+#       end
     end
     
     Base.register(self, 'list_all', 'list_all', 'Lists all targets')

data/lib/middleman-targets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemanTargets
-        VERSION = '1.0.10'
+        VERSION = '1.0.11'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-targets
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Jim Derry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core