rotten-generators 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/generators.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generators}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Coulton"]
-  s.date = %q{2009-06-26}
+  s.date = %q{2009-07-26}
   s.email = %q{peter@petercoulton.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -104,11 +104,10 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/rotten/generators}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Collection of rails generators}
   s.test_files = [
     "spec/rotten_spec.rb",
@@ -117,7 +116,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/rails_generators/rotten_layout/templates/helper.rb

@@ -19,16 +19,16 @@ module LayoutHelper
   end
   
   def version
-    tag, commits, sha = `git describe`.split('-')
-    major, minor, patch = tag[1..-1].split('.')
-    [major, minor, patch].each { |e| e.chomp! }
     
-    version = "v#{major}.#{minor}.#{patch}"
-    unless commits.nil?
-      version += "-#{commits}" unless commits.nil?
-      version += "-#{sha.chomp}" unless sha.nil?
+    major, minor, patch, commits, objname, objname2 = `git describe --always`.scan(/\Av(\d*)\.(\d*).(\d*)?-?(\d*)?-?([\d\w]{7})?\z|([\d\w]{7})/)[0]
+    
+    if major == nil
+      return "Commit: #{objname2}"
+    else
+      version = "v#{major}.#{minor}.#{patch}"
+      version += " +#{commits}" unless commits == ""
+      return version
     end
-    version += "-#{ENV['RAILS_ENV']}"
   end
 
 end

data/rails_generators/rotten_layout/templates/sass/colour.sass

@@ -94,8 +94,18 @@ a:hover
       :background
         :color= !content_background
 
-    h2
-      :background-color #CDE
+      h2
+        :background-color #CDE
+  
+      h5, h6
+        :border 0
+          :bottom 1px #000
+  
+      h5
+        :border-style solid
+
+      h6
+        :border-style dotted
 
     
   .sidebar .content

data/rails_generators/rotten_layout/templates/sass/type.sass

@@ -107,25 +107,33 @@ h1, h2, h3, h4, h5, h6
   :letter-spacing 0
   :margin-bottom 0.667em
 
-h1, h2, h3
+h1, h2, h3, h4
   :font
     :family = !fs_large_headings
-    :size = !px16
 
-h4, h5, h6
+h5, h6
   :font
     :family = !fs_small_headings
-    :size = !px16
  
 h1
-  :font-size 5em
+  :font-size= !px72
   :margin-bottom 0
 
 h2
-  :font-size 3em
+  :font-size= !px48
 
 h3
-  :font-size 2em
+  :font-size= !px36
+
+h4
+  :font-size= !px24
+
+h5
+  :font-size= !px18
+
+h6
+  :font-size= !px16
+
 
 
 //================================================================== +BASIC TEXT
@@ -159,7 +167,6 @@ p
 #hd
 
   h1
-    
     .beta
       :font-size 40%
 
@@ -170,15 +177,20 @@ p
   .main
     .content
     
-      h2, h3, h4, h5, h6
-        
       h2
         :padding 0.2em
         :margin
-          :left -0.67em
-          :right -0.67em
+          :left -0.55em
+          :right -0.55em
           :bottom 0.25em
-  
+      
+      h3
+        :margin-bottom 0.4em
+      
+      h5, h6
+        :margin-bottom 0.4em
+        :padding-bottom 0.2em
+          
   .sidebar 
     .content
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rotten-generators
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Peter Coulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-26 00:00:00 -07:00
+date: 2009-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -113,7 +113,7 @@ files:
 - spec/rotten_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/rotten/generators
 post_install_message: 
 rdoc_options: 
@@ -137,7 +137,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Collection of rails generators
 test_files: 
 - spec/rotten_spec.rb