awestruct 0.5.6.beta5 → 0.5.6.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8da264db525dd9720d5fb24fcf7caa8f7e0be5f
-  data.tar.gz: eccb58baf90c70f61768063f74afbfa2fdb6ec0d
+  metadata.gz: db7e55c31a2f868ff2af456fa99b3973cca5ace4
+  data.tar.gz: 75fa63745025b3c997570656784aa9a0d90d4282
 SHA512:
-  metadata.gz: 28fed5e74ec3e7e0009a91a89712988d8e29cfc7baed8e2e7235598ad104930e472325e522e751a4f96ab0266050f43f493685d14c1b97a64b8672d6dcffa869
-  data.tar.gz: f446847490a8208a8da6884a0511a9fcfca1441618cdae077883ab657bd5bf2b2b3d25928843f05bcb062dbb38869aeaacd32cbacd0979cd4ebc4277b4dea8ef
+  metadata.gz: 434c89d4a35282060da472a792200ee1d6b0ec591562776f87af431bf4cee4a688741bf3c95df8ebe34c844c6e37d2e09aa02b018e660f85a505be6a35df804a
+  data.tar.gz: c7ff96fc604bdf64d679aadc7ab155880755e188f0df655df374fa224559062be1c5073d0252677ca3cd05d005bb69be33684f2a372886766723bb2c432fdebb

data/Gemfile

@@ -5,8 +5,8 @@ group :development do
   gem 'rspec', '~> 2.14.1'
   gem 'rake', '~> 10.2.2'
   gem 'guard-rspec', '~> 4.2.0', :require => false
-  #gem 'pry', :require => false
-  #gem 'pry-byebug', :require => false
+  gem 'pry', :require => false
+  gem 'pry-byebug', :require => false
 end
 
 group :test do

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2014-11-05'
+  s.date          = '2014-11-12'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']

data/lib/awestruct/cli/options.rb

@@ -47,7 +47,7 @@ module Awestruct
         @init       = false
         @framework  = 'compass'
         @scaffold   = true
-        @base_url   = nil
+        @base_url   = DEFAULT_BASE_URL
         @profile    = nil
         @deploy     = false
         @script     = nil

data/lib/awestruct/engine.rb

@@ -3,7 +3,6 @@ require 'awestruct/util/exception_helper'
 require 'awestruct/util/default_inflections'
 
 require 'awestruct/config'
-require 'awestruct/compass/default_configuration'
 require 'awestruct/site'
 require 'awestruct/pipeline'
 require 'awestruct/page'
@@ -267,14 +266,66 @@ module Awestruct
       site.css_dir         = File.join( site.config.output_dir, 'stylesheets' )
       site.javascripts_dir = File.join( site.config.dir, 'javascripts' )
 
-      default_config = Awestruct::Compass::DefaultConfiguration.new(site)
+      ::Compass.configuration do |config|
+        config.project_type = :stand_alone
+        config.environment = site.profile
+        config.project_path = site.config.dir
+        config.sass_path = File.join(config.project_path, 'stylesheets')
+        config.http_path = site.base_url || site.config.options.base_url || '/'
+        config.css_path = File.join(site.output_dir, 'stylesheets')
+        config.javascripts_path = File.join(site.output_dir, 'javascripts')
+        config.http_javascripts_dir = File.join(config.http_path, 'javascripts')
+        config.http_stylesheets_dir = File.join(config.http_path, 'stylesheets')
+        config.generated_images_dir = File.join(site.output_dir, 'images')
+        config.http_generated_images_dir = File.join(config.http_path, 'images')
+        config.sprite_load_path = [config.images_path]
+        config.http_images_dir = File.join(config.http_path, 'images')
+        config.images_path = File.join(config.project_path, 'images')
+        config.fonts_dir = 'fonts'
+        config.fonts_path = File.join(config.project_path, 'fonts')
+        config.http_fonts_dir = File.join(config.http_path, 'fonts')
+
+        config.line_comments = lambda do
+          if site.profile.eql? 'production'
+            return false
+          else
+            if site.key? :compass_line_comments
+              return site.compass_line_comments 
+            end
+            if site.key?(:scss) && site.scss.key?(:line_comments)
+              return site.scss.line_comments
+            end
+            if site.key?(:sass) && site.sass.key?(:line_comments)
+              return site.sass.line_comments
+            end
+            true
+          end
+        end.call
+
+        config.output_style = lambda do
+          if site.profile.eql? 'production'
+            return :compressed
+          else
+            if site.key? :compass_output_style
+              return site.compass_output_style
+            end
+            if (site.key? :scss) && (site.scss.key? :style)
+              return site.scss.style
+            end
+            if (site.key? :sass) && (site.sass.key? :style)
+              return site.sass.style
+            end
+          end
+          :expanded
+        end.call
+
+        config.relative_assets = false
+      end
+
       compass_config_file = File.join(site.config.config_dir, 'compass.rb')
       if (File.exists? compass_config_file)
-        default_config.inherit_from! ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
+        ::Compass.add_configuration ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
       end 
-
-      ::Compass.reset_configuration!
-      ::Compass.add_configuration default_config
       ::Compass.configuration # return for use elsewhere
 
       # TODO: Should we add an on_stylesheet_error block?  

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.6.beta5'
+  VERSION = '0.5.6.beta6'
 end

data/spec/awestruct/cli/init_spec.rb

@@ -13,6 +13,6 @@ describe Awestruct::CLI::Init do
 
   it "should not fail during init" do 
     init = Awestruct::CLI::Init.new('spec/support/clean_init', 'compass', true)
-    expect(init.run).to eql true
+    expect(init.run).to eql true # There may be some sort of race condition here
   end
 end

data/spec/awestruct/cli/options_spec.rb

@@ -19,7 +19,7 @@ describe Awestruct::CLI::Options do
     options.framework.should == 'compass'
     options.scaffold.should == true
 
-    options.base_url.should == nil
+    options.base_url.should == 'http://localhost:4242'
     options.profile.should  == nil
     options.script.should   == nil
     options.verbose.should  == false

data/spec/awestruct/engine_spec.rb

@@ -103,7 +103,7 @@ describe Awestruct::Engine do
 
     expect( Compass.configuration.line_comments ).to eq false
     expect( Compass.configuration.output_style ).to eq :compressed
-    expect( Compass.configuration.http_path ).to be nil
+    expect( Compass.configuration.http_path ).to eq "http://localhost:4242"
     expect( Compass.configuration.relative_assets ).to eq false 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.6.beta5
+  version: 0.5.6.beta6
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml