middleman-core 4.0.0.alpha.5 → 4.0.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9570d8f9765585574f06e78f6d773db42228ac92
-  data.tar.gz: 46eb43196b0dcaa048639ae53b220fb464ec16af
+  metadata.gz: 6e34ff77656a24cfb0e1d05a9da94084ec6969e5
+  data.tar.gz: 8a3dfb3ed28cab63a63bdcde9394e7b3c4ab49c8
 SHA512:
-  metadata.gz: acdd4d200e34be9c4e88cf3a7da30584e3a3e1af3b58d67643d63fb9b8af12aa738ebb55840b09acecc97cf2aa3d131ed3b4a6fa3a3f3046190cc8388260f3ac
-  data.tar.gz: a8be04d81b41429ab43de894afb886877506e035283dc1a36c507d538a65139dbc5dd7536b79e13b0d9adbc24feeef557743f1803746dfb0fe01c559aa890219
+  metadata.gz: 8ffb4c00d0e57ed303012affd7a06644641d6546251fd7f47ea788c98981b0f6d406c041aa03df5c38db6281c6599fc50618e76678095be8ce3b3f4d4d7c2c21
+  data.tar.gz: 8398c13098126daa8e9c01484c0ef4f9bb317f89f2abd5a42278d3939af5edace360c7732d7e92e90ccba932cffe9830c1c843c6616a5fdc7fc6bfd47b1f1296

data/features/cli_init.feature

@@ -1,7 +1,11 @@
 Feature: Middleman CLI
 
   Scenario: Create a new project
-    Given I run `middleman init MY_PROJECT`
+    When I run `middleman init MY_PROJECT` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
     Then the exit status should be 0
     When I cd to "MY_PROJECT"
     Then the following files should exist:
@@ -9,17 +13,19 @@ Feature: Middleman CLI
       | .gitignore                                    |
       | config.rb                                     |
       | source/index.html.erb                         |
-      | source/images/background.png                  |
-      | source/images/middleman.png                   |
       | source/layouts/layout.erb                     |
       | source/javascripts/all.js                     |
-      | source/stylesheets/all.css                    |
-      | source/stylesheets/normalize.css              |
+      | source/stylesheets/site.css.scss              |
+      | source/stylesheets/_normalize.scss            |
 
   Scenario: Create a new project in the current directory
     Given a directory named "MY_PROJECT"
     When I cd to "MY_PROJECT"
-    And I run `middleman init`
+    And I run `middleman init` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
     Then the exit status should be 0
     And the following files should exist:
       | Gemfile                                       |
@@ -27,13 +33,25 @@ Feature: Middleman CLI
       | source/index.html.erb                         |
 
   Scenario: Create a new project (alias i)
-    When I run `middleman i MY_PROJECT`
+    When I run `middleman i MY_PROJECT` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
     Then a directory named "MY_PROJECT" should exist
 
   Scenario: Create a new project (alias new)
-    When I run `middleman new MY_PROJECT`
+    When I run `middleman new MY_PROJECT` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
     Then a directory named "MY_PROJECT" should exist
 
   Scenario: Create a new project (alias n)
-    When I run `middleman n MY_PROJECT`
+    When I run `middleman n MY_PROJECT` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
     Then a directory named "MY_PROJECT" should exist

data/features/minify_javascript.feature

@@ -138,7 +138,7 @@ Feature: Minify Javascript
     </script>
     <script type='text/javascript'>
       //<!--
-    !function(){line(),here()}();
+    !function(){one,line(),here()}();
       //-->
     </script>
     <script type='text/html'>

data/lib/middleman-core/application.rb

@@ -255,7 +255,7 @@ module Middleman
           Tilt.mappings.delete(key)
         end
       end
-      
+
       @extensions.activate_all
 
       run_hook :after_configuration

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.0.0.alpha.5' unless const_defined?(:VERSION)
+  VERSION = '4.0.0.alpha.6' unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency('hooks', ['~> 0.3'])
 
   # Helpers
-  s.add_dependency('activesupport', ['~> 4.1.0'])
+  s.add_dependency('activesupport', ['~> 4.2.0'])
   s.add_dependency('padrino-helpers', ['~> 0.12.3'])
   s.add_dependency("addressable", ["~> 2.3.5"])
 
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency('listen', ['>= 2.7.9', '< 3.0'])
 
   # i18n
-  s.add_dependency('i18n', ['~> 0.6.9'])
+  s.add_dependency('i18n', ['~> 0.7.0'])
 
   # Automatic Image Sizes
   s.add_dependency('fastimage', ['~> 1.6.2'])
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_dependency('compass-import-once', ['~> 1.0.4'])
 
   # Minify JS
-  s.add_dependency('uglifier', ['~> 2.5'])
+  s.add_dependency('uglifier', ['~> 2.6'])
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.5
+  version: 4.0.0.alpha.6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,14 +108,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,6 @@ files:
 - ".simplecov"
 - ".yardopts"
 - Rakefile
-- features/3rd_party_cli.feature
 - features/asset_hash.feature
 - features/asset_host.feature
 - features/auto_layout.feature
@@ -1229,7 +1228,6 @@ signing_key:
 specification_version: 4
 summary: Hand-crafted frontend development
 test_files:
-- features/3rd_party_cli.feature
 - features/asset_hash.feature
 - features/asset_host.feature
 - features/auto_layout.feature

data/features/3rd_party_cli.feature

@@ -1,15 +0,0 @@
-Feature: Allow config.rb and extensions to add CLI commands
-
-  Scenario: Command autoloaded from tasks/ directory
-    Given an empty app
-    And a file named "tasks/hello_task.rb" with:
-      """
-      class Hello < Thor
-        desc "hello", "Say hello"
-        def hello
-          puts "Hello World"
-        end
-      end
-      """
-    When I run `middleman hello`
-    Then the output should contain "Hello World"