ronin-grid 1.1.0.alpha.1 → 1.1.0.alpha.2

data/README.md

@@ -6,7 +6,7 @@ Ronin is a framework for creating responsive web designs with SASS.
 
 ## Installation
 
-### Rails >= 3.1
+### Rails
 
 In your `Gemfile`:
 
@@ -14,26 +14,47 @@ In your `Gemfile`:
 gem 'ronin-grid' 
 ```
 
+Run the installer:
+
+```bash
+rake ronin-grid:install
+```
+
+We do not want Ronin's SASS files to be compiled, so remove the following line
+from `app/assets/stylesheets/application.css`:
+
+```css
+*= require_tree .
+```
+
 Import Ronin into your SASS stylesheets:
 
 ```scss
 @import 'ronin-grid';
 ```
 
-### Rails < 3.0.x
-
-Install with Rake:
+Customize:
 
-```
-$ rake ronin-grid:install
+```bash
+vim app/assets/stylesheets/ronin-grid/_setup.scss
 ```
 
-Import Ronin into your SASS stylesheets:
+### Non-Rails
 
-```scss
-@import 'ronin-grid'
+Use the binary:
+
+```bash
+ronin-grid install
+# Creates ronin-grid/lib/ronin-grid/...
 ```
 
+or:
+
+```bash
+ronin-grid install-bare
+# Creates _ronin-grid.scss
+# Creates ronin-grid/...
+```
 ---
 
 ## Usage
@@ -117,3 +138,4 @@ Released under a [modified MIT license][license]
 
 [twitter]: http://twitter.com/_clem
 [license]: http://github.com/jclem/ronin-grid/tree/master/LICENSE.md
+[jonathan_clem]: http://jclem.net

data/lib/ronin-grid/generator.rb

@@ -9,6 +9,7 @@ module RoninGrid
     def run
       case @command
       when 'install'; install
+      when 'install-bare'; install(true)
       when 'update'; update
       when 'uninstall'; uninstall
       when '-v'; version
@@ -32,10 +33,11 @@ module RoninGrid
       end
     end
 
-    def install
+    def install(bare = false)
       if ronin_installed?
         puts 'Ronin already installed, halting update.'
       else
+        @bare = bare ? true : false
         install_ronin
         puts 'Ronin installed into ronin-grid/'
       end
@@ -53,20 +55,20 @@ module RoninGrid
     private
 
     def ronin_installed?
-      Dir.exist?('ronin_grid')
+      Dir.exist?('ronin-grid')
     end
 
     def install_ronin
-      make_lib_directory
+      make_lib_directory unless @bare
       copy_sass_files
     end
 
     def remove_ronin_directory
-      FileUtils.rm_rf('ronin_grid')
+      FileUtils.rm_rf('ronin-grid')
     end
 
     def copy_sass_files
-      FileUtils.cp_r(all_sass_files, 'ronin_grid/')
+      FileUtils.cp_r(all_sass_files, install_dir)
     end
 
     def all_sass_files
@@ -74,7 +76,15 @@ module RoninGrid
     end
 
     def make_lib_directory
-      FileUtils.mkdir_p('ronin_grid/lib/ronin_grid')
+      FileUtils.mkdir_p(lib_directory)
+    end
+
+    def lib_directory
+      'ronin-grid/lib/ronin-grid'
+    end
+
+    def install_dir
+      @bare ? '.' : lib_directory
     end
 
     def sass_dir

data/lib/ronin-grid/version.rb

@@ -1,3 +1,3 @@
 module RoninGrid
-  VERSION = "1.1.0.alpha.1"
+  VERSION = "1.1.0.alpha.2"
 end

data/lib/ronin-grid.rb

@@ -7,12 +7,13 @@ module RoninGrid
       require 'ronin-grid/engine'
     end
 
-    module Rails
-      class Railtie < ::Rails::Railtie
-        rake_tasks do
-          load 'tasks/install.rake'
-        end
-      end
-    end
+    # Pointless, as _setup.scss cannot be overridden.
+    # module Rails
+      # class Railtie < ::Rails::Railtie
+        # rake_tasks do
+          # load 'tasks/install.rake'
+        # end
+      # end
+    # end
   end
 end

data/lib/tasks/install.rake

@@ -2,10 +2,8 @@
 namespace :'ronin-grid' do
   desc "Install the Ronin files into the Rails assets directory"
   task :install, [:sass_path] do |t, args|
-    args.with_defaults :sass_path => 'public/assets/stylesheets'
+    args.with_defaults :sass_path => 'app/assets/stylesheets'
     source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-    `mkdir -p #{Rails.root}/#{args.sass_path}/ronin-grid`
-    `cp -a #{source_root}/app/assets/stylesheets/* #{Rails.root}/#{args.sass_path}/ronin-grid`
-    `find #{Rails.root}/#{args.sass_path}/ronin-grid -name "*.css.scss" | while read i; do mv "$i" "${i%.css.scss}.scss"; done`
+    `cp -a #{source_root}/app/assets/stylesheets/* #{Rails.root}/#{args.sass_path}`
   end
 end

data/lib/tasks/setup.rake

@@ -0,0 +1,13 @@
+# Currently unusable, as it does not override existing file if ronin-grid is
+# not explicitly installed via `rake ronin-grid:install`. Keeping around for
+# future reference.
+namespace :'ronin-grid' do
+  desc "Install the app/assets/stylesheets/ronin-grid/_setup.scss file."
+  task :setup, [:sass_path] do |t, args|
+    args.with_defaults :sass_path => 'app/assets/stylesheets'
+    source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+    `mkdir -p #{Rails.root}/#{args.sass_path}/ronin-grid`
+    `cp -a #{source_root}/app/assets/stylesheets/ronin-grid/_setup.scss #{Rails.root}/#{args.sass_path}/ronin-grid`
+  end
+end
+

data/ronin-grid.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "ronin-grid"
   s.version     = RoninGrid::VERSION
   s.authors     = ["Jonathan Clem"]
-  s.email       = ["jclem@jclem.net"]
+  s.email       = ["j@jclem.net"]
   s.homepage    = "https://github.com/jclem/ronin-grid"
   s.summary     = %q{Slice and dice content into a flexible, responsive grid with media queries.}
   s.description = <<-DESCRIPTION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ronin-grid
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.1
+  version: 1.1.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70241720491440 !ruby/object:Gem::Requirement
+  requirement: &70142889997580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.0.alpha.64
   type: :runtime
   prerelease: false
-  version_requirements: *70241720491440
+  version_requirements: *70142889997580
 description: ! 'The objective of Ronin is to provide a framework for developing flexible,
   responsive web designs that are compatible back to IE7. Ronin aims to be somewhat
   of a "framework framework", meaning that it is column-count- and width-agnostic.
@@ -30,7 +30,7 @@ description: ! 'The objective of Ronin is to provide a framework for developing
 
 '
 email:
-- jclem@jclem.net
+- j@jclem.net
 executables:
 - ronin-grid
 extensions: []
@@ -41,7 +41,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/assets/stylesheets/_ronin-grid.css.scss
+- app/assets/stylesheets/_ronin-grid.scss
 - app/assets/stylesheets/ronin-grid/_classes.scss
 - app/assets/stylesheets/ronin-grid/_grid.scss
 - app/assets/stylesheets/ronin-grid/_setup.scss
@@ -51,6 +51,7 @@ files:
 - lib/ronin-grid/generator.rb
 - lib/ronin-grid/version.rb
 - lib/tasks/install.rake
+- lib/tasks/setup.rake
 - ronin-grid.gemspec
 homepage: https://github.com/jclem/ronin-grid
 licenses: []
@@ -77,4 +78,3 @@ signing_key:
 specification_version: 3
 summary: Slice and dice content into a flexible, responsive grid with media queries.
 test_files: []
-has_rdoc: