asphalt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0487d650796c423775e06355c7c18e144a2718
-  data.tar.gz: ce677999bc5ac0958580c3288be10a643c4863d5
+  metadata.gz: cbe182c4727007bf9abb7d6fd39a8d6b2c905d5b
+  data.tar.gz: ba18613e2243ff3c669be72d56369625b324e08a
 SHA512:
-  metadata.gz: 17995f50c917684ce1c93454f52782c396496332ce0278950b485f5b5372d13d80e3e632caf7ac74628341f25fd864740ba69ee6b2228422f37d1e1270f7fd12
-  data.tar.gz: 253e028501ed8ea063e089d38c0f85446140696f3d365a6072e7d11b57b32c57b93f2d6ee9b3008bee0cf609da210ed426e401dad82f52fbb6ed0c28b40fbe01
+  metadata.gz: b00c2ce4cac6cf03a737efb28ce43a984689822e6dd34531908951de8578c748aeab24d2b57fbfe565c4d10e9760c3b049c01c83ae90dc5cfb4391547a2509ef
+  data.tar.gz: 607fea8922c466c6f2e3e44bf5efae11e3f2896cccdf85c8dd46a605d72d2b9e666d4bdfef807610d5b6a38107ead05c9430d4fe6613f754090dd86faa9690e7

data/README.md

@@ -18,7 +18,7 @@ Install it from RubyGems:
 
 or clone and install from this repo
 
-    $ git clone https//github.com/donokuda/asphalt.git
+    $ git clone https://github.com/donokuda/asphalt.git
     $ cd asphalt
     $ rake install
 
@@ -31,7 +31,11 @@ In the directory of your stylesheets:
 
 This will generate a folder structure of partialized Scss files.
 
-That's it! Run `sass -w /path/to/stylesheet_folder/main.scss` to compile your sass files!
+If you prefer the indented sass syntax, you can run
+
+    $ asphalt init --sass
+
+That's it! Run `sass -w main.scss` to compile your sass files!
 
 
 ## Contributing

data/asphalt.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.add_dependency "thor", "~> 0.18.1"
+  spec.add_dependency "sass", "~> 3.2.10"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/asphalt/cli.rb

@@ -2,9 +2,11 @@ require 'thor'
 
 module Asphalt
   class CLI < Thor
+    option :sass, :type => :boolean
     desc "init /path/to/stylesheets", "bootstrap directory with a set of Sass files"
     def init(target_directory=Dir.pwd)
-      Asphalt::Generator.init!(target_directory)
+      format = :sass if options[:sass] == true
+      Asphalt::Generator.init!(target_directory, :format => format)
     end
   end
 

data/lib/asphalt/generator.rb

@@ -1,7 +1,7 @@
 module Asphalt
   module Generator
     # FIXME: TOMDOC this method and all other methods
-    def self.init!(directory)
+    def self.init!(directory, options = {})
       directories = ["modules", "partials", "vendors"]
       directories.each do |scaffold_dir|
         FileUtils.mkdir_p(File.join(directory, scaffold_dir)) unless Dir.exists?(File.join(directory, scaffold_dir))
@@ -20,10 +20,26 @@ module Asphalt
 
       files.each do |scaffold_file|
         template_file_path = File.join(File.dirname(__FILE__), 'templates', scaffold_file)
-        target_file =  File.new(File.join(directory, scaffold_file), 'a+')
+
+        scaffold_directory = File.dirname(scaffold_file)
+        scaffold_filename  = File.basename(scaffold_file, File.extname(scaffold_file))
+
+        if scaffold_file == 'partials/_base.sass'
+          scaffold_ext = '.sass'
+        else
+          scaffold_ext = options[:format] == :sass ? ".sass" : ".scss"
+        end
+
+        scaffold_file_path = File.join(scaffold_directory, scaffold_filename + scaffold_ext)
+
+        target_file =  File.new(File.join(directory, scaffold_file_path), 'a+')
 
         if File.exists?(template_file_path)
-          target_file.write(File.read(template_file_path))
+          if options[:format] == :sass && File.extname(template_file_path) == '.scss'
+            target_file.write(`sass-convert #{ template_file_path } -F scss -T sass`)
+          else
+            target_file.write(File.read(template_file_path))
+          end
           target_file.close
         end
       end

data/lib/asphalt/version.rb

@@ -1,3 +1,3 @@
 module Asphalt
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/asphalt_spec.rb

@@ -35,8 +35,6 @@ describe Asphalt::Generator do
     end
 
     it "should have content in the files generated" do
-      fixtures_path = File.expand_path(File.join(__FILE__, '..', 'fixtures', 'example_stylesheet_folder'))
-
       Asphalt::Generator.init!(@temp_directory)
 
       File.read(File.join(@temp_directory, 'main.scss')).should match(%r(// ASPHALT GENERATED: MODULES))
@@ -58,6 +56,31 @@ describe Asphalt::Generator do
       existing_file_content.should match("// ASPHALT GENERATED: MODULES")
     end
 
+    context "with the sass format option" do
+      it "creates sass files with the sass argument" do
+        sass_directory = Dir.mktmpdir
+
+        Asphalt::Generator.init!(sass_directory, :format => :sass)
+
+        File.should exist(File.join(sass_directory, 'main.sass'))
+        File.should exist(File.join(sass_directory, 'modules', '_all.sass'))
+        File.should exist(File.join(sass_directory, 'partials', '_base.sass'))
+        File.should exist(File.join(sass_directory, 'partials', '_buttons.sass'))
+
+        FileUtils.remove_entry_secure sass_directory
+      end
+
+      it "has files with the indented sass format" do
+        sass_directory = Dir.mktmpdir
+
+        Asphalt::Generator.init!(sass_directory, :format => :sass)
+        File.read(File.join(sass_directory, 'main.sass')).should match(%r(@import partials/base$))
+        File.read(File.join(sass_directory, 'partials', '_base.sass')).should match(%r(@import "modules/all"$))
+
+        FileUtils.remove_entry_secure sass_directory
+      end
+    end
+
     after(:all) do
       FileUtils.remove_entry_secure @temp_directory
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asphalt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Don Okuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,9 +103,6 @@ files:
 - lib/asphalt/templates/partials/_base.sass
 - lib/asphalt/version.rb
 - spec/asphalt_spec.rb
-- spec/fixtures/example_stylesheet_folder/main.scss
-- spec/fixtures/example_stylesheet_folder/modules/_all.scss
-- spec/fixtures/example_stylesheet_folder/partials/_base.sass
 - spec/spec_helper.rb
 homepage: https://github.com/donokuda/asphalt
 licenses:
@@ -119,7 +130,4 @@ specification_version: 4
 summary: Asphalt paves the way for your Sass stylesheets!
 test_files:
 - spec/asphalt_spec.rb
-- spec/fixtures/example_stylesheet_folder/main.scss
-- spec/fixtures/example_stylesheet_folder/modules/_all.scss
-- spec/fixtures/example_stylesheet_folder/partials/_base.sass
 - spec/spec_helper.rb

data/spec/fixtures/example_stylesheet_folder/main.scss

@@ -1,17 +0,0 @@
-// ASPHALT: MODULES
-@import "partials/base";
-
-// ASPHALT: PARTIALS
-@import "partials/reset";
-@import "partials/typography";
-@import "partials/buttons";
-@import "partials/figures";
-@import "partials/grids";
-
-// Import third party styles here
-// PROTIP: Be sure to change the file extension to .scss
-// EXAMPLES:
-//   @import "vendor/colorpicker";
-//   @import "vendor/jquery.ui.core";
-
-// Your styles go here:

data/spec/fixtures/example_stylesheet_folder/modules/_all.scss

@@ -1,4 +0,0 @@
-// Include this to get all your modules
-// ASPHALT GENERATED: Modules
-@import 'utility';
-@import 'colors';

data/spec/fixtures/example_stylesheet_folder/partials/_base.sass

@@ -1,23 +0,0 @@
-// Uncomment if you use compass
-// @import "compass"
-
-// Font weights
-$light: 100
-$regular: 400
-$bold: 600
-
-// Base Font
-$base-font-family: sans-serif
-$base-font-weight: $regular
-$base-font-size: 13px
-$base-line-height: 1.4
-
-// Fixed Font
-$fixed-font-family: monospace
-$fixed-font-size: 85%
-$fixed-line-height: $base-line-height
-
-// Headings
-$header-font-weight: $bold
-
-@import "modules/all"