forge 0.4.4 → 0.5.0

data/README.md

@@ -6,7 +6,7 @@
 
 -----
 
-Current Version: **0.3.0**
+Current Version: **0.5.0**
 
 Install Forge (requires [Ruby](http://www.ruby-lang.org/) and [RubyGems](http://rubygems.org/)):
 
@@ -42,4 +42,14 @@ Get a little help with the Forge commands:
 
     $ forge help
 
-See the [user's manual](http://forge.thethemefoundry.com/manual) for more information.
+See the [user's manual](http://forge.thethemefoundry.com/manual) for more information.
+
+-----
+
+**Note for upgrading existing projects to 0.5.0:**
+
+As of version 0.5.0, Forge no longer generates the header of your **style.css** file based on the values in `config.rb`.
+
+Instead, you need to write your own header and include it in **style.css.scss** yourself to generate a valid theme stylesheet.
+
+If you have any questions on migrating, open a new issue and we'll help you sort it out!

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/forge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forge"
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Adams", "Drew Strojny", "Matt Button"]
-  s.date = "2012-08-12"
+  s.date = "2012-10-02"
   s.description = "A toolkit for bootstrapping and developing WordPress themes."
   s.email = "aadams@jestro.com"
   s.executables = ["forge"]
@@ -33,10 +33,10 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "forge.gemspec",
     "layouts/config/config.tt",
-    "layouts/config/stylesheet_header.erb",
     "layouts/default/functions/functions.php.erb",
     "layouts/default/javascripts/admin.js",
     "layouts/default/javascripts/theme.js",
+    "layouts/default/stylesheets/_header.scss.erb",
     "layouts/default/stylesheets/_reset.scss",
     "layouts/default/stylesheets/_typography.scss",
     "layouts/default/stylesheets/style.css.scss.erb",
@@ -66,10 +66,6 @@ Gem::Specification.new do |s|
     "lib/guard/forge/config.rb",
     "lib/guard/forge/functions.rb",
     "lib/guard/forge/templates.rb",
-    "pkg/forge-0.4.0.gem",
-    "pkg/forge-0.4.1.gem",
-    "pkg/forge-0.4.2.gem",
-    "pkg/forge-0.4.3.gem",
     "spec/lib/forge/config_spec.rb",
     "spec/lib/forge/project_spec.rb",
     "spec/spec_helper.rb"

data/layouts/config/config.tt

@@ -1,32 +1,4 @@
-# The name of the theme
-config[:name] = "<%= config[:name] %>"
-
-# The website for the theme
-config[:uri] = "<%= config[:uri] %>"
-
-# The author's name
-config[:author] = "<%= config[:author] %>"
-
-# The author's website
-config[:author_uri] = "<%= config[:author_uri] %>"
-
-# Description of the theme
-config[:description] = "<%= config[:description] %>"
-
-# Version number of the theme
-config[:version_number] = "<%= config[:version_number] %>"
-
-# Name of the theme license
-config[:license_name] = "<%= config[:license_name] %>"
-
-# Website for the theme license
-config[:license_uri] = "<%= config[:license_uri] %>"
-
-# Tags for this theme, as an array (ex. ["blue", "white", "two-columns"])
-config[:tags] = <%= config[:tags] ? config[:tags] : "[]" %>
-
-# Additional comments (optional)
-config[:comments] = "<%= config[:comments] %>"
+# WordPress theme information is stored in source/assets/stylesheets/_header.scss as of Forge version 0.5
 
 # JavaScript compression
 # config[:compress_js] = false

data/layouts/default/stylesheets/style.css.scss.erb

@@ -1,3 +1,6 @@
+// WordPress theme header
+@import "header";
+
 // This is your master stylesheet
 
 // Use SASS to include CSS partials

data/lib/forge/builder.rb

@@ -165,10 +165,6 @@ module Forge
                 file.write(YUI::JavaScriptCompressor.new.compress(sprockets_output))
               end
             end
-
-            if asset.last == 'style.css'
-              @task.prepend_file destination, @project.parse_erb(stylesheet_header)
-            end
           end
         rescue Exception => e
           @task.say "Error while building #{asset.last}:"
@@ -256,12 +252,6 @@ module Forge
     end
 
     protected
-    def stylesheet_header
-      return @stylesheet_header unless @stylesheet_header.nil?
-
-      file = @task.find_in_source_paths(File.join('config', 'stylesheet_header.erb'))
-      @stylesheet_header = File.expand_path(file)
-    end
 
     # Write an .erb from source to destination, catching and reporting errors along the way
     def write_erb(source, destination)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70206555867540 !ruby/object:Gem::Requirement
+  requirement: &70272598662640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.15.4
   type: :runtime
   prerelease: false
-  version_requirements: *70206555867540
+  version_requirements: *70272598662640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70206556005080 !ruby/object:Gem::Requirement
+  requirement: &70272598766300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206556005080
+  version_requirements: *70272598766300
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70206556003940 !ruby/object:Gem::Requirement
+  requirement: &70272598810900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206556003940
+  version_requirements: *70272598810900
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70206556002740 !ruby/object:Gem::Requirement
+  requirement: &70272598810340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70206556002740
+  version_requirements: *70272598810340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70206556002100 !ruby/object:Gem::Requirement
+  requirement: &70272598809580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206556002100
+  version_requirements: *70272598809580
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70206556001560 !ruby/object:Gem::Requirement
+  requirement: &70272598809100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206556001560
+  version_requirements: *70272598809100
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &70206556000940 !ruby/object:Gem::Requirement
+  requirement: &70272598808620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206556000940
+  version_requirements: *70272598808620
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70206556000380 !ruby/object:Gem::Requirement
+  requirement: &70272598808080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206556000380
+  version_requirements: *70272598808080
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70206555999880 !ruby/object:Gem::Requirement
+  requirement: &70272598807320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70206555999880
+  version_requirements: *70272598807320
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &70206555999220 !ruby/object:Gem::Requirement
+  requirement: &70272598806440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206555999220
+  version_requirements: *70272598806440
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70206555998720 !ruby/object:Gem::Requirement
+  requirement: &70272598805820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 2.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70206555998720
+  version_requirements: *70272598805820
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70206555998180 !ruby/object:Gem::Requirement
+  requirement: &70272598804800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206555998180
+  version_requirements: *70272598804800
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &70206556072240 !ruby/object:Gem::Requirement
+  requirement: &70272598803760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70206556072240
+  version_requirements: *70272598803760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206556071480 !ruby/object:Gem::Requirement
+  requirement: &70272598803140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206556071480
+  version_requirements: *70272598803140
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70206556070760 !ruby/object:Gem::Requirement
+  requirement: &70272598802480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206556070760
+  version_requirements: *70272598802480
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70206556070040 !ruby/object:Gem::Requirement
+  requirement: &70272598801780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206556070040
+  version_requirements: *70272598801780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206556069040 !ruby/object:Gem::Requirement
+  requirement: &70272598801060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -199,10 +199,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70206556069040
+  version_requirements: *70272598801060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70206556067360 !ruby/object:Gem::Requirement
+  requirement: &70272598800580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -210,7 +210,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70206556067360
+  version_requirements: *70272598800580
 description: A toolkit for bootstrapping and developing WordPress themes.
 email: aadams@jestro.com
 executables:
@@ -235,10 +235,10 @@ files:
 - features/support/env.rb
 - forge.gemspec
 - layouts/config/config.tt
-- layouts/config/stylesheet_header.erb
 - layouts/default/functions/functions.php.erb
 - layouts/default/javascripts/admin.js
 - layouts/default/javascripts/theme.js
+- layouts/default/stylesheets/_header.scss.erb
 - layouts/default/stylesheets/_reset.scss
 - layouts/default/stylesheets/_typography.scss
 - layouts/default/stylesheets/style.css.scss.erb
@@ -268,10 +268,6 @@ files:
 - lib/guard/forge/config.rb
 - lib/guard/forge/functions.rb
 - lib/guard/forge/templates.rb
-- pkg/forge-0.4.0.gem
-- pkg/forge-0.4.1.gem
-- pkg/forge-0.4.2.gem
-- pkg/forge-0.4.3.gem
 - spec/lib/forge/config_spec.rb
 - spec/lib/forge/project_spec.rb
 - spec/spec_helper.rb
@@ -288,9 +284,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4158602189199387329
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: