middlemac-extras 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85e311f64a6b602ca9b5c9f9c04aefd33dbd19f
-  data.tar.gz: c9fa9f990646fb0cd4556d0b00853581f56e8ccc
+  metadata.gz: 495994db42495680f0b1120222ed61daa388c862
+  data.tar.gz: 1b2a542810f637be1ddcad663a6294b2845c5c4a
 SHA512:
-  metadata.gz: 5499e4cc80d1d6e9f7d52535d42910a3de2ea2c98321e9568cdb097f6610ffa673328146e9d141755cae62e1e765d9684261e8fab22f6c7ee3d4f9285514585e
-  data.tar.gz: 4febfd9e6312beb93cfe60118b03bd9995fab19266e0bed3cd05fc96a7e4dea28b0b0c43b83ffbc984a0a1b64f34118728cc2e542838b8005cd847533e70d8d6
+  metadata.gz: 7772bd7134d91de59d3aac5c3fb17dbeda7e9e6e1fe55207b05c174521120fc490d0c7c5d39230060e7b4dbb4dccfdb6e77ae944b110c82872d8c8bfcc292ac9
+  data.tar.gz: cb51007b3c6706795746ccc35864c3ad18dbb5674a4cbe164d22e7d61f3ceabc740b6d8278b1343aff06a2c432fce6f037dd9c3ce31a8a6dbfd1774cc26f25c4

data/CHANGELOG.md

@@ -1,13 +1,19 @@
 middlemac-extras change log
 ===========================
 
-- Version 1.0.7 / 2016-May-11
+- Version 1.0.8 / 2016-May-15
 
+  - Bump to 1.0.8 improvements:
+      - Better version management in Rakefile.
+      - Fixes failing Cucumber testing by forcing capybara development dependency.
   - Version 1.0.7 supports RAKE, Yard, etc.
       - YARD support added.
       - Cucumber tests added.
       - Documentation project updates.
       - Source code commented extensively for YARD.
+
+- Version 1.0.6 / 2016-April-08
+
   - Works cooperative if middleman-targets is installed to support images without extensions for target-specific images, too. Added CLI help section.
 
 - Version 1.0.5 / 2016-April-08

data/Rakefile

@@ -86,11 +86,7 @@ desc 'Remove any wip suffix from the version'
 task :version_finalize do
   version_old = Middleman::MiddlemacExtras::VERSION
   version_new = version_old.sub('.wip', '')
-  update_version_file( version_new )
-  update_doc_file( version_new )
-  update_doc_gemfile( version_new )
-  Middleman::MiddlemacExtras.send(:remove_const, 'VERSION')
-  Middleman::MiddlemacExtras::VERSION = version_new
+  update_versions( version_new )
 end
 
 
@@ -104,11 +100,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 )
-  update_doc_gemfile( version_new )
-  Middleman::MiddlemacExtras.send(:remove_const, 'VERSION')
-  Middleman::MiddlemacExtras::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,38 +177,29 @@ private
 
 
 ###############################################################################
-# update_version_file
-#   Replace the version in the `version.rb` file.
-###############################################################################
-def update_version_file( version_new )
-  file = File.expand_path('../lib/middlemac-extras/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_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}."
-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/middlemac-extras/version.rb', __FILE__),
+      :regex => /(?<=VERSION = ')(.*)(?=')/
+    },
+    {
+      :file  => File.expand_path('../documentation_project/Gemfile', __FILE__),
+      :regex => /(?<=gem 'middlemac-extras', '~> ).*(?=')/
+    },
+    {
+      :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_gemfile
-#   Replace the version in the `documentation_project/Gemfile` file.
-###############################################################################
-def update_doc_gemfile( version_new )
-  file = File.expand_path('../documentation_project/Gemfile', __FILE__)
-  content = File.read(file)
-  # gem 'middlemac-extras', '~> 1.0.7.wip'
-  content.sub!(/(?<=gem 'middlemac-extras', '~> ).*(?=')/, version_new)
-  File.write(file, content)
-  puts "Gemfile changed to #{version_new}."
+  Middleman::MiddlemacExtras::VERSION.replace version_new
 end

data/documentation_project/Gemfile

@@ -9,7 +9,7 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw]
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 
 # Middleman Gems
-gem 'middlemac-extras', '~> 1.0.7'
+gem 'middlemac-extras', '~> 1.0.8'
 gem 'middleman', '~> 4.1.7'
 gem 'middleman-syntax'
 

data/documentation_project/config.rb

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

data/lib/middlemac-extras/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemacExtras
-        VERSION = '1.0.7'
+        VERSION = '1.0.8'
     end
 end

data/middlemac-extras.gemspec

@@ -32,4 +32,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: middlemac-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 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
@@ -126,6 +126,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: Implements several useful developer conveniences for Middleman projects.
 email:
 - balthisar@gmail.com