middleman-targets 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82480769f95eaac813243c7929ca199f36ffa5b
-  data.tar.gz: 991f1492c11900ded03061961e8b8c3426fc001e
+  metadata.gz: e34940fd32f574977097b9092ba42a88cdc067bb
+  data.tar.gz: a476d42726325de71f5fb21cd73d861e0974e6e8
 SHA512:
-  metadata.gz: 0a8975f43c2e6653edb4519da03ed82263e2e003d851432e78b58c442879c4eff647a31fc7ecbbf102b05761eae1573768d7e5fd067ea12089b2137ec6338a16
-  data.tar.gz: decf462d568bef42d85022cdf013643ddfb72a8a792b657ffc291998ac2b113406cca9dc4b7d95c5aa76ab4169d620052f7b236ee908d857aabc28eba9ff03e4
+  metadata.gz: 0f78348d953a9d4a2fc4c57c4bce4acaa788ab0e0831f0f69d445f2a424a9ff116b106142cc53f48ff67c4e8b26f5dd02c5930d997e2995c6addeae156bc530f
+  data.tar.gz: 864a4824fb85e9de8250707f9f88cd73f36f89d84d6d4e9322f1b27e3da5b1810a0a8557e81c0be5c6d6ddebf4a6e51b9d582e5e023dc3659c5863693f05320c

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 middleman-targets change log
 ============================
 
-- Version 1.0.6 / 2016-May-11
-
+- Version 1.0.7 / 2016-May-15
+
+  - Bump to 1.0.7 fixes:
+      - Require capybara as development dependency fixes broken testing.
+      - Improved the Rakefile version manipulation system.
+      - Ensure sample project uses correct Gem versions.
+  - Version 1.0.7.wip
+      - Bump to 1.0.7.wip.
+      - to be determined.
   - Version 1.0.6
       - Added the missing documentation file git didn't commit.
       - Introduced several RAKE tasks to manage distribution.

data/Rakefile

@@ -88,10 +88,7 @@ desc 'Remove any wip suffix from the version'
 task :version_finalize do
   version_old = Middleman::MiddlemanTargets::VERSION
   version_new = version_old.sub('.wip', '')
-  update_version_file( version_new )
-  update_doc_file( version_new )
-  Middleman::MiddlemanTargets.send(:remove_const, 'VERSION')
-  Middleman::MiddlemanTargets::VERSION = version_new
+  update_versions( version_new )
 end
 
 
@@ -105,10 +102,17 @@ task :version_next_wip do
   version_new = version_old.sub('.wip', '').split('.')
   version_new.last.succ!
   version_new = version_new.join('.') + '.wip'
-  update_version_file( version_new )
-  update_doc_file( version_new )
-  Middleman::MiddlemanTargets.send(:remove_const, 'VERSION')
-  Middleman::MiddlemanTargets::VERSION = version_new
+  update_versions( version_new )
+end
+
+
+###############################################################################
+# :version_set
+#   Sets an arbitrary version.
+###############################################################################
+desc 'Sets all of the files to the version specified. Use rake version_set[value].'
+task :version_set, :new_version do |t, args|
+  update_versions( args[:new_version] )
 end
 
 
@@ -175,25 +179,29 @@ private
 
 
 ###############################################################################
-# update_version_file
-#   Replace the version in the `version.rb` file.
-###############################################################################
-def update_version_file( version_new )
-  file = File.expand_path('../lib/middleman-targets/version.rb', __FILE__)
-  content = File.read(file)
-  content.sub!(/(?<=VERSION = ')(.*)(?=')/, version_new)
-  File.write(file, content)
-  puts "version.rb changed to #{version_new}."
-end
+# update_versions
+#   Update the version in various files that depend on the correct version.
+###############################################################################
+def update_versions( version_new )
+  [ {
+      :file  => File.expand_path('../lib/middleman-targets/version.rb', __FILE__),
+      :regex => /(?<=VERSION = ')(.*)(?=')/
+    },
+    {
+      :file  => File.expand_path('../documentation_project/Gemfile', __FILE__),
+      :regex => /(?<=gem 'middleman-targets', '~> ).*(?=')/
+    },
+    {
+      :file  => File.expand_path('../documentation_project/config.rb', __FILE__),
+      :regex => /(?<=def product_version\n    ').*?(?='\n  end)/m
+    },
+  ].each do | item |
+    
+    content = File.read( item[:file] )
+    content.gsub!( item[:regex], version_new )
+    File.write( item[:file], content )
+    puts "#{File.basename( item[:file] )} changed to '#{version_new}'."
+  end
 
-###############################################################################
-# update_doc_file
-#   Replace the version in the `documentation_project/config.rb` file.
-###############################################################################
-def update_doc_file( version_new )
-  file = File.expand_path('../documentation_project/config.rb', __FILE__)
-  content = File.read(file)
-  content.sub!(/(?<=def product_version).*?(?=end)/m, "\n    '#{version_new}'\n")
-  File.write(file, content)
-  puts "config.rb changed to #{version_new}."
+  Middleman::MiddlemanTargets::VERSION.replace version_new
 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.5'
+gem 'middleman-targets', '~> 1.0.7'
 gem 'middleman', '~> 4.1.6'
 gem 'middleman-syntax'

data/documentation_project/config.rb

@@ -103,11 +103,7 @@ helpers do
   end
 
   def product_version
-    '1.0.6'
-end
-
-  def product_uri
-    'https://github.com/middlemac'
+    '1.0.7'
   end
 
 end

data/lib/middleman-targets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemanTargets
-        VERSION = '1.0.6'
+        VERSION = '1.0.7'
     end
 end

data/middleman-targets.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler',   '>= 1.6'
   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.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Jim Derry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: Provides multiple build targets and tools for Middleman.
 email:
 - balthisar@gmail.com
@@ -213,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides multiple build targets and tools for Middleman.