flatrack 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19e4a9f13cab919d16beac789e1030adc8484ef
-  data.tar.gz: e28d6c79ef1c3fde4e1a117c160d0c339b4b9f52
+  metadata.gz: 18f2a64112e63e97157245c00c1ea592bf0afbdb
+  data.tar.gz: eca104199ffa912f5b4dbc87f8423027c0512a8b
 SHA512:
-  metadata.gz: ccafe9a3cfc1b91d6cbce338062f6d71767e8840cbcc81a0fb5aa15b0aec8a114b27f1a7a10a26aa2e5604de61976f91b8af32b1d6ca370c6e11c0a586484fa0
-  data.tar.gz: 5de8c2db8beea1d99f89db153f38b0c4ebe4ea573da2a879bbb2a082a32cb3fed458265f2a9d7ff1f293679c5481b2f5c53b8aff3bdfc10425d3041841eec29f
+  metadata.gz: c0d551d21329e7c2a1848e02c538a606dc558d32a0fcafbe40282c00a5ff26bab931cd44ba922220b07a8f634df322a0d21b951936e41d1ec24300616426f6e8
+  data.tar.gz: ead79f7435dd9b79962112da8d38866d13505163ea109b3bd37d012d3b80b9705ecc8e2c544aaa75481f8a9201e023f1dc0d7a6119e7b5eaa6e7db5aa1af788c

data/.gitignore

@@ -2,4 +2,5 @@ Gemfile.lock
 pkg/*
 *.gem
 tmp
-coverage
+coverage
+/.sass-cache/

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Flatrack 1.1.1 (March 05, 2014)
+
+*   Fix gem build errors, and update dependencies.
+
+    *Jason Waldrip*
+
 # Flatrack 1.1.0 (March 05, 2014)
 
 *   Added support for rendering partials in views

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec unless ENV['RM_INFO']
+gemspec

data/README.md

@@ -3,8 +3,8 @@
 
 [![Version](http://allthebadges.io/jwaldrip/flatrack/badge_fury.png)](http://allthebadges.io/jwaldrip/flatrack/badge_fury)
 [![Dependencies](http://allthebadges.io/jwaldrip/flatrack/gemnasium.png)](http://allthebadges.io/jwaldrip/flatrack/gemnasium)
-[![Build Status](http://allthebadges.io/jwaldrip/flatrack/travis.png?1)](http://allthebadges.io/jwaldrip/flatrack/travis)
-[![Coverage](http://allthebadges.io/jwaldrip/flatrack/coveralls.png)](http://allthebadges.io/jwaldrip/flatrack/coveralls)
+[![Build Status](http://allthebadges.io/jwaldrip/flatrack/travis.png)](http://allthebadges.io/jwaldrip/flatrack/travis)
+[![Coverage](http://allthebadges.io/jwaldrip/flatrack/coveralls.png?1)](http://allthebadges.io/jwaldrip/flatrack/coveralls)
 [![Code Climate](http://allthebadges.io/jwaldrip/flatrack/code_climate.png)](http://allthebadges.io/jwaldrip/flatrack/code_climate)
 
 ## About

data/flatrack.gemspec

@@ -30,20 +30,20 @@ based routing.
 
   # Dependencies
   spec.add_runtime_dependency 'rack', '~> 1.4'
-  spec.add_runtime_dependency 'activesupport', '~> 3.2'
+  spec.add_runtime_dependency 'activesupport', ['> 3.2', '< 4.2']
   spec.add_runtime_dependency 'sass', '~> 3.2'
   spec.add_runtime_dependency 'sprockets-sass', '~> 1.0'
   spec.add_runtime_dependency 'thor', '~> 0.18'
   spec.add_runtime_dependency 'coffee-script', '~> 2.2'
-  spec.add_runtime_dependency 'rake', '~> 0.8'
+  spec.add_runtime_dependency 'rake', ['> 0.8.7', '< 10.2']
 
   # Dev Dependencies
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rspec', '~> 3.0.0.beta'
+  spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'guard', '~> 2.5'
   spec.add_development_dependency 'guard-rspec', '~> 4.2'
   spec.add_development_dependency 'guard-bundler', '~> 2.0'
-  spec.add_development_dependency 'pry', '~> 0.9.12.6'
-  spec.add_development_dependency 'coveralls', '~> 0.7.0'
-  spec.add_development_dependency 'simplecov', '~> 0.8.2'
+  spec.add_development_dependency 'pry', '~> 0.9'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'simplecov', '~> 0.8'
 end

data/lib/flatrack.rb

@@ -2,6 +2,7 @@ require 'flatrack/version'
 require 'active_support/all'
 require 'sprockets'
 require 'sprockets-sass'
+require 'coffee-script'
 require 'sass'
 require 'rack'
 

data/lib/flatrack/version.rb

@@ -1,3 +1,3 @@
 class Flatrack
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/rake/asset_tasks.rb

@@ -10,11 +10,13 @@ module Rake
   #
   class AssetTasks < Rake::TaskLib
     attr_accessor :output
-    attr_accessor :environment
+    attr_reader :environment
     attr_reader :index
     attr_reader :manifest
     attr_reader :keep
 
+    delegate :paths, to: :environment
+
     # Number of old assets to keep.
 
     # Logger to use during rake tasks. Defaults to using stderr.
@@ -46,15 +48,16 @@ module Rake
       @logger       = Logger.new($stderr)
       @logger.level = Logger::INFO
       @output       = './public/assets'
-      yield self
-      @index        = environment.index
-      @manifest     = Sprockets::Manifest.new(index, output)
-      @keep         = 2
+      yield self if block_given?
+      @index    = environment.index
+      @manifest = Sprockets::Manifest.new(index, output)
+      @keep     = 2
       define
     end
 
     def assets
-      Dir['assets/**/*.*'].map do |file|
+      files = paths.reduce([]) { |a, p| a + Dir[File.join p, '**', '*'] }
+      files.map do |file|
         file_basename = File.basename file
         parts         = file_basename.split('.').size
         file          = file.split('.').tap(&:pop).join('.') if parts > 2

data/spec/lib/rake/asset_tasks_spec.rb

@@ -1,55 +1,73 @@
 require 'spec_helper'
+require 'flatrack'
 require 'rake/asset_tasks'
-require 'coffee-script'
 
 describe Rake::AssetTasks do
   include FileUtils
+  include SiteHelper
 
   before(:all) do
-    @rake            = Rake::Application.new
-    Rake.application = @rake
+    @sha = site(clean: false) do
+      @rake            = Rake::Application.new
+      Rake.application = @rake
 
-    @env = Sprockets::Environment.new(".") do |env|
-      env.append_path File.join Flatrack.gem_root, '../spec/fixtures/assets'
-    end
-
-    @dir = File.join(Dir::tmpdir, 'sprockets/manifest')
+      @env = Flatrack.assets
+      @dir = File.join(Dir::tmpdir, 'sprockets/manifest')
 
-    @manifest = Sprockets::Manifest.new(@env, @dir)
-
-    Rake::AssetTasks.new do |t|
-      t.environment = @env
-      t.output      = @dir
-      t.log_level   = :fatal
+      Rake::AssetTasks.new do |t|
+        t.output    = @dir
+        t.log_level = :fatal
+      end
     end
   end
 
   after(:all) do
     Rake.application = nil
+    cleanup(@sha)
     rm_rf(@dir)
     expect(Dir["#{@dir}/*"]).to be_empty
   end
 
-  it "should precompile" do
-    digest_path = @env['application.js'].digest_path
-    expect(File.exist? "#{@dir}/#{digest_path}").to be false
+  describe '#log_level=' do
+    it 'should set the proper log level' do
+      @sha = site(clean: false) do
+        allow_any_instance_of(Rake::AssetTasks).to receive(:define)
+        tasks = Rake::AssetTasks.new do |t|
+          t.output    = @dir
+          t.log_level = 1
+        end
+        expect(tasks.log_level).to eq 1
+      end
+    end
+  end
 
-    @rake['assets:precompile'].invoke
+  describe 'tasks' do
 
-    expect(Dir["#{@dir}/manifest-*.json"]).to be_present
-    expect(File.exist? "#{@dir}/#{digest_path}").to be true
-  end
+    it "should precompile" do
+      digest_path = @env['main.js'].digest_path
+      expect(File.exist? "#{@dir}/#{digest_path}").to be false
 
-  it "should clobber" do
-    digest_path = @env['application.js'].digest_path
+      @rake['assets:precompile'].invoke
 
-    @rake['assets:precompile'].invoke
-    expect(File.exist? "#{@dir}/#{digest_path}").to be true
+      expect(Dir["#{@dir}/manifest-*.json"]).to be_present
+      expect(File.exist? "#{@dir}/#{digest_path}").to be true
+    end
 
-    @rake['assets:clobber'].invoke
-    expect(File.exist? "#{@dir}/#{digest_path}").to be false
-  end
+    it "should clobber" do
+      digest_path = @env['main.js'].digest_path
+
+      @rake['assets:precompile'].invoke
+      expect(File.exist? "#{@dir}/#{digest_path}").to be true
+
+      @rake['assets:clobber'].invoke
+      expect(File.exist? "#{@dir}/#{digest_path}").to be false
+    end
+
+    it "should clean" do
+      expect {
+        @rake['assets:clean'].invoke
+      }.to_not raise_error
+    end
 
-  xit "should clean" do
   end
 end

data/spec/spec_helper.rb

@@ -16,6 +16,6 @@ Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+  config.filter_run focus: true
   config.before(:each){ Flatrack.reset! }
 end

data/spec/support/site_helper.rb

@@ -5,7 +5,7 @@ module SiteHelper
   DIR = File.join Flatrack.gem_root, '../tmp/flatrack-sites'
   mkdir_p DIR
 
-  def site
+  def site(clean: true)
     sha = SecureRandom.hex
     in_temp_sites do
       Flatrack::CLI.start(
@@ -15,7 +15,7 @@ module SiteHelper
         yield
       end
     end
-    cleanup sha
+    clean ? cleanup(sha) : sha
   rescue => error
     cleanup sha
     raise error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jason Waldrip
@@ -28,16 +28,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +104,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -184,42 +196,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.6
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.6
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '0.8'
 description: |+
   A rack based static site builder with templates, layouts and project structure
   based routing.