awestruct 0.5.6.beta6 → 0.5.6.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7e55c31a2f868ff2af456fa99b3973cca5ace4
-  data.tar.gz: 75fa63745025b3c997570656784aa9a0d90d4282
+  metadata.gz: 2d0a0b884f8f8075f62ef50c24e8b88da675c91c
+  data.tar.gz: f9caa74d8b9515b3ff070d9a50cdb3e1f9574770
 SHA512:
-  metadata.gz: 434c89d4a35282060da472a792200ee1d6b0ec591562776f87af431bf4cee4a688741bf3c95df8ebe34c844c6e37d2e09aa02b018e660f85a505be6a35df804a
-  data.tar.gz: c7ff96fc604bdf64d679aadc7ab155880755e188f0df655df374fa224559062be1c5073d0252677ca3cd05d005bb69be33684f2a372886766723bb2c432fdebb
+  metadata.gz: 5bac0dbe6355ee74fcc0649fecefc809cca2ec8beb48a0609bf0a83e252280dc8a0a636efcf71f7645229aae12b199940c868348cf6428d7f1a888397295ed74
+  data.tar.gz: 0c01f22fd87ead009d771cbc99d7f25cebbda6e5afcab6587fb7e2f28c847382b70ca35aa4ab86b46cd46d1841bd99aa9e40252abbce0e148c46b32a6ef9dcf9

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   gem 'rake', '~> 10.2.2'
   gem 'guard-rspec', '~> 4.2.0', :require => false
   gem 'pry', :require => false
-  gem 'pry-byebug', :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-12'
+  s.date          = '2014-11-13'
 
   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/manifest.rb

@@ -1,33 +1,8 @@
 require 'sass/callbacks'
 require 'compass'
 require 'compass/commands'
-require 'compass/installers/bare_installer'
 
-module ::Compass::AppIntegration::StandAlone
-end
-
-class ::Compass::AppIntegration::StandAlone::Installer
-  def write_configuration_files(config_file = nil)
-    # no!
-  end
-
-  def finalize(opts={})
-    $LOG.info <<-END.gsub(/^ {6}/, '')
-
-      Now you're awestruct!
-
-      To generate and run your site in development mode, execute:
-
-        awestruct -d
-
-      or, simply:
-
-        rake
-
-      then visit your site at: #{::Awestruct::CLI::Options::DEFAULT_BASE_URL}
-    END
-  end
-end
+# TODO: We could create our own installer and use that
 
 module Awestruct
   module CLI
@@ -245,6 +220,7 @@ module Awestruct
               :images_dir => 'images',
               :fonts_dir => 'fonts',
               :javascripts_dir => 'javascripts',
+              :bare => true
           })
           cmd.perform
         end

data/lib/awestruct/engine.rb

@@ -276,8 +276,6 @@ module Awestruct
         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')
@@ -285,6 +283,11 @@ module Awestruct
         config.fonts_path = File.join(config.project_path, 'fonts')
         config.http_fonts_dir = File.join(config.http_path, 'fonts')
 
+        if config.generated_images_dir == config.default_for('generated_images_dir')
+          config.generated_images_dir = File.join(site.output_dir, 'images')
+          config.http_generated_images_dir = File.join(config.http_path, 'images')
+        end
+
         config.line_comments = lambda do
           if site.profile.eql? 'production'
             return false

data/lib/awestruct/version.rb

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

data/spec/awestruct/cli/init_spec.rb

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

data/spec/awestruct/cli/invoker_spec.rb

@@ -4,11 +4,11 @@ require 'awestruct/cli/invoker'
 
 describe Awestruct::CLI::Invoker do
   before(:each) do
-    FileUtils.mkdir_p 'spec/support/clean_init'
+    FileUtils.mkdir_p 'spec/support/clean_invoker'
   end
 
   after(:each) do
-    FileUtils.rm_rf 'spec/support/clean_init'
+    FileUtils.rm_rf 'spec/support/clean_invoker'
   end
 
   it "should invoke generation by default" do

metadata

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