toadstool 0.0.0.5 → 0.0.0.7

data/lib/bin/toadstool

@@ -14,94 +14,90 @@ module Toadstool
 
     # Define arguments and options
     argument :name, {:default => './'}
+    class_option :styleguide_directory, :type => :string, :default => "./styleguide/", :desc => 'The directory for the Toadstool app.'
 
     def self.source_root
       APP_PATH
     end
 
     def install_app
-      # Per https://github.com/wycats/thor/pull/175#issuecomment-2250270
-      # If any empty directory is found, it's copied and all .empty_directory files are ignored.
-      # If any file name is wrapped within % signs, the text within the % signs will be executed
-      # as a method and replaced with the returned value.
-
-      directory "project/doc-src", "#{name}/doc-src"
-      directory "project/public", "#{name}/public"
-      directory "project/sass", "#{name}/sass"
-      directory "project/views", "#{name}/views"
-
-      copy_file "project/config.rb", "#{name}/config.rb"
-      copy_file "project/config.ru", "#{name}/config.ru"
-      copy_file "project/Gemfile", "#{name}/Gemfile"
-      copy_file "project/Rakefile", "#{name}/Rakefile"
-      copy_file "project/readme.md", "#{name}/readme.md"
-      copy_file "project/toadstool.rb", "#{name}/toadstool.rb"
+      directory "project/doc-src", "#{install_directory}/doc-src"
+      directory "project/public", "#{install_directory}/public"
+      directory "project/sass", "#{install_directory}/sass"
+      directory "project/views", "#{install_directory}/views"
+
+      copy_file "project/config.rb", "#{install_directory}/config.rb"
+      copy_file "project/config.ru", "#{install_directory}/config.ru"
+      copy_file "project/Gemfile", "#{install_directory}/Gemfile"
+      copy_file "project/Rakefile", "#{install_directory}/Rakefile"
+      copy_file "project/readme.md", "#{install_directory}/readme.md"
+      copy_file "project/toadstool.rb", "#{install_directory}/toadstool.rb"
+    end
+
+    def install_directory
+      File.join('./', name, options[:styleguide_directory])
     end
   end
 
   class Server < Thor::Group
-    def exec_script_rails!
+    def start # no desc
+      
       cwd = Dir.pwd
-      return unless in_rails_application? || in_rails_application_subdirectory?
-      exec 'rackup', *ARGV if in_rails_application?
+      return unless in_toadstool_app? || in_app_subdirectory?
+      exec 'rackup', *ARGV if in_toadstool_app?
       Dir.chdir("..") do
         # Recurse in a chdir block: if the search fails we want to be sure
         # the application is generated in the original working directory.
-        exec_script_rails! unless cwd == Dir.pwd
+        start! unless cwd == Dir.pwd
       end
       rescue SystemCallError
         # could not chdir, no problem just return
     end
-    
-     no_tasks do
-       def in_rails_application?
-         File.exists?('config.ru')
-       end
 
+    no_tasks do
+      def in_toadstool_app?
+        File.exists?('toadstool.rb') && File.exists?('config.ru')
+      end
 
-       def in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))
-         File.exists?(File.join(path, 'config.ru')) || !path.root? && in_rails_application_subdirectory?(path.parent)
-       end
-     end
+      def in_app_subdirectory?(path = Pathname.new(Dir.pwd))
+        File.exists?(File.join(path, 'config.ru')) || !path.root? && in_app_subdirectory?(path.parent)
+      end
+    end
   end
-  
-  
 
-# end
-# 
-# 
-# module Toadstool
   class Generator < Thor
+    def self.source_root
+      APP_PATH
+    end
+
     include Thor::Actions
-      argument :name
-      argument :state
-      
-      desc 'ts_module', "Generate a module"
-      def ts_module
-        create_file "views/modules/#{name}/_#{state}.erb"
-        create_file "views/modules/#{name}/readme.md"
-        create_file "sass/modules/#{name}/#{state}/_#{state}.sass", "@import 'mixins'\n@import 'extends'"
-        create_file "sass/modules/#{name}/#{state}/_extends.sass"
-        create_file "sass/modules/#{name}/#{state}/_mixins.scss"
-
-        create_file 'sass/_modules.sass' if !File.exist?('sass/_modules.sass')
-        
-        append_file 'sass/_modules.sass', "@import 'modules/#{name}/#{state}/#{state}'"
-      end
+    argument :truffle
+    argument :oil
+
+    desc 'ts_module', "Generate a module"
+    def ts_module
+      directory "module/views", "views/modules/#{truffle}"
+      directory "module/sass", "sass/modules/#{truffle}"
+
+      append_file 'sass/_modules.scss', "@import 'modules/#{truffle}/#{oil}/#{oil}'"
+    end
 
-      desc 'ts_pattern', "Generate a module"
-      def ts_pattern
-        create_file "views/ui_patterns/#{name}/_#{state}.erb"
-        create_file "views/ui_patterns/#{name}/readme.md"
-        create_file "sass/ui_patterns/#{name}/#{state}/_#{state}.sass", "@import 'mixins'\n@import 'extends'"
-        create_file "sass/ui_patterns/#{name}/#{state}/_extends.sass"
-        create_file "sass/ui_patterns/#{name}/#{state}/_mixins.scss"
-
-        create_file 'sass/_ui_patterns.sass' if !File.exist?('sass/_ui_patterns.sass')
-        
-        append_file 'sass/_ui_patterns.sass', "@import 'ui_patterns/#{name}/#{state}/#{state}'"
+    desc 'pattern', "Generate a module"
+    def pattern
+      directory "pattern/views", "views/ui_patterns/#{truffle}"
+      directory "pattern/sass", "sass/ui_patterns/#{truffle}"
+
+      append_file 'sass/_ui_patterns.scss', "@import 'ui_patterns/#{truffle}/#{oil}/#{oil}'"
+    end
+
+    no_tasks do
+      def shiitake
+        "#{oil}"
       end
     end
+
+    map 'module' => 'ts_module'
+  end
 end
 
 
@@ -112,7 +108,8 @@ ARGV << '--help' if ARGV.empty?
 aliases = {
   "i"  => "install",
   "new"  => "install",
-  "s"  => "server"
+  "s"  => "server",
+  "g"  => "generate"
 }
 
 
@@ -135,7 +132,6 @@ when 'install'
   Toadstool::Install.start
 when 'server'
   Toadstool::Server.start
-  
 when 'generate'
   Toadstool::Generator.start
 else

data/lib/stylesheets/_toadstool-styleguide.scss

@@ -11,14 +11,7 @@
 
 // Following sequence will load the necessary Stipe libraries
 // ------------------------------------------------------------------------------
-@import "stipe/media";
-@import "stipe/stipe";                   
-@import "stipe/media";
-@import "stipe/typography";             
-@import "stipe/grid";      
-@import "stipe/forms";               
-@import "stipe/color";                   
-@import "stipe/gradients"; 
+@import "stipe/manifest"; 
                
 
 

data/lib/stylesheets/toadstool/_buttons.scss

@@ -1,8 +1,13 @@
 [class*="toadstool"] {
 	.nav_toggle {
-		@include linear_gradient_w3c ($alpha_gray, #{$delta_gray 0%, $alpha_gray 100%});
+	  $nav_toggle_gradient: $delta_gray 0%, $alpha_gray 100%;
+	  $nav_toggle_gradient_hover: $alpha_gray 0%, $delta_gray 100%;
+	  
+		@include linear_gradient_w3c ($alpha_gray, $nav_toggle_gradient);
+		
+		//@include linear_gradient_w3c (#e4e4e4, #{#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%});
 		&:hover {
-			@include linear_gradient_w3c ($alpha_gray, #{$alpha_gray 0%, $delta_gray 100%});
+			@include linear_gradient_w3c ($alpha_gray, $nav_toggle_gradient_hover);
 			border-color: $alpha_gray;
 			box-shadow: 0 0 0;
 		}

data/lib/stylesheets/toadstool/modules/_main_nav.scss

@@ -5,7 +5,9 @@
     font-weight: bold;
     @media #{$mobile} {
       @include flexbox(100%, auto, $orient: vertical);
-      @include linear_gradient_w3c ($bravo_gray, #{$bravo_gray 30%,$delta_gray 100%});
+      
+      $toadstool_nav_gradient: $bravo_gray 30%, $delta_gray 100%;      
+      @include linear_gradient_w3c ($bravo_gray, $toadstool_nav_gradient);
     }
   }
   li {
@@ -26,7 +28,9 @@
   }
   a {
     color: $white;
-    @include linear_gradient_w3c ($bravo_gray, #{$bravo_gray 50%,$delta_gray 100%}); 
+    
+    $toadstool_nav_gradient: $bravo_gray 50%,$delta_gray 100%;
+    @include linear_gradient_w3c ($bravo_gray, $toadstool_nav_gradient); 
     .no-flexbox & {
       padding: 0 em(10);
     }

data/lib/templates/module/sass/%shiitake%/_%shiitake%.sass

@@ -0,0 +1,2 @@
+@import 'mixins'
+@import 'extends'

data/lib/templates/pattern/sass/%shiitake%/_%shiitake%.sass

@@ -0,0 +1,2 @@
+@import 'mixins'
+@import 'extends'

data/lib/templates/project/Gemfile

@@ -1,9 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'sinatra'
+gem 'sinatra-partial'
 gem 'sass'
 gem 'compass'
-gem 'sinatra-partial'
-gem 'rake'
 gem 'stipe'
 gem 'toadstool'

data/lib/templates/project/sass/style.scss

@@ -36,6 +36,5 @@
 @import "forms";
 @import "buttons";
 @import "design";
-@import "ui_patterns/example_pattern/example_pattern";
-@import "modules/example_module/example_module";
-@import "layouts/example_layout";
+@import "ui_patterns";
+@import "modules";

data/lib/templates/project/toadstool.rb

@@ -1,7 +1,7 @@
 # Those little ditties that Sinatra needs to make the magic happen
 # -----------------------------------------------------------------------
 require 'rubygems'
-require 'net/http'
+
 
 # If you're using bundler, you will need to add this
 require 'bundler/setup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toadstool
 version: !ruby/object:Gem::Version
-  version: 0.0.0.5
+  version: 0.0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: lib/bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -132,12 +132,16 @@ files:
 - lib/stylesheets/toadstool/ui_patterns/_color_grid.scss
 - lib/stylesheets/toadstool/ui_patterns/_emBox.scss
 - lib/stylesheets/toadstool/ui_patterns/_prettify.scss
-- lib/templates/module/sass/_example_module.scss
-- lib/templates/module/sass/_extends.scss
-- lib/templates/module/sass/_mixins.scss
-- lib/templates/module/views/module.erb
-- lib/templates/module/views/module.js
-- lib/templates/module/views/view.erb
+- lib/templates/module/sass/%shiitake%/_%shiitake%.sass
+- lib/templates/module/sass/%shiitake%/_extends.scss
+- lib/templates/module/sass/%shiitake%/_mixins.scss
+- lib/templates/module/views/_%shiitake%.erb
+- lib/templates/module/views/readme.md
+- lib/templates/pattern/sass/%shiitake%/_%shiitake%.sass
+- lib/templates/pattern/sass/%shiitake%/_extends.scss
+- lib/templates/pattern/sass/%shiitake%/_mixins.scss
+- lib/templates/pattern/views/_%shiitake%.erb
+- lib/templates/pattern/views/readme.md
 - lib/templates/project/config.rb
 - lib/templates/project/config.ru
 - lib/templates/project/doc-src/changelog.md
@@ -145,6 +149,7 @@ files:
 - lib/templates/project/doc-src/module-sass-readme.md
 - lib/templates/project/doc-src/SASS-Guidelines.md
 - lib/templates/project/Gemfile
+- lib/templates/project/public/favicon.ico
 - lib/templates/project/public/images/toadstool-logo.png
 - lib/templates/project/public/javascripts/application.js
 - lib/templates/project/public/javascripts/jquery-1.8.3.min.js
@@ -159,8 +164,10 @@ files:
 - lib/templates/project/sass/_config.scss
 - lib/templates/project/sass/_design.scss
 - lib/templates/project/sass/_forms.scss
+- lib/templates/project/sass/_modules.scss
 - lib/templates/project/sass/_reset.scss
 - lib/templates/project/sass/_typography.scss
+- lib/templates/project/sass/_ui_patterns.scss
 - lib/templates/project/sass/buttons/_extends.scss
 - lib/templates/project/sass/buttons/_mixins.scss
 - lib/templates/project/sass/color/_color_defaults.scss
@@ -170,7 +177,6 @@ files:
 - lib/templates/project/sass/color/readme.md
 - lib/templates/project/sass/forms/_extends.scss
 - lib/templates/project/sass/forms/_mixins.scss
-- lib/templates/project/sass/layouts/_example_layout.scss
 - lib/templates/project/sass/readme.md
 - lib/templates/project/sass/style.scss
 - lib/templates/project/sass/toadstool.scss
@@ -210,10 +216,6 @@ files:
 - lib/templates/project/views/ui_patterns/readme.md
 - lib/templates/project/views/ui_patterns/typography/_body_copy.erb
 - lib/templates/project/views/ui_patterns/typography/_headings.erb
-- lib/templates/ui_pattern/sass/_example_pattern.scss
-- lib/templates/ui_pattern/sass/_extends.scss
-- lib/templates/ui_pattern/sass/_mixins.scss
-- lib/templates/ui_pattern/views/example.erb
 - lib/toadstool/version.rb
 - lib/toadstool.rb
 homepage: https://github.com/Anotheruiguy/toadstool

data/lib/templates/module/sass/_example_module.scss

@@ -1,4 +0,0 @@
-@import "mixins";
-@import "extends";
-
-// -----------------------------------------

data/lib/templates/ui_pattern/sass/_example_pattern.scss

@@ -1,4 +0,0 @@
-@import "mixins";
-@import "extends";
-
-// -----------------------------------------

data/lib/templates/ui_pattern/views/example.erb

@@ -1 +0,0 @@
-example ui pattern to go here