forge 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+== 0.4.0 ==
+- Added lib to assets folder on generation
+- Allow multiple functions files in the source/functions folder, including subfolders
+
 == 0.3.0 ==
 - Changed configuration over to Ruby from JSON
 - Fixed some bugs that caused forge watch to crash
@@ -12,7 +16,7 @@
 - Fixed bug where forge watch crashed when a file was at the root of the includes folder
 
 == 0.1.2 ==
-- build and package commands were not copying includes
+- "build" and "package" commands were not copying includes
 - Removing hidden files from includes folder, if they exist
 - Updating rack gem - silences the warning it threw in 1.3.4
 

data/Gemfile

@@ -14,7 +14,7 @@ gem "compass", "~> 0.11.5"
 gem 'rack', '~> 1.3.5'
 gem "guard-livereload", "~> 0.3.1"
 gem "less", "~> 2.0.7"
-gem "rb-fsevent", "~> 0.4.3.1"
+gem "rb-fsevent", "~> 0.9.1"
 gem "yui-compressor", "~> 0.9.6"
 
 # Add dependencies to develop your gem here.
@@ -25,5 +25,4 @@ group :development do
   gem "aruba"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -5,40 +5,37 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    addressable (2.2.6)
-    aruba (0.4.6)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.2.0)
-      cucumber (>= 1.0.2)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.2)
-      rack (~> 1.0)
+    addressable (2.3.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     builder (3.0.0)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    chunky_png (1.2.5)
-    compass (0.11.5)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
+    chunky_png (1.2.6)
+    commonjs (0.2.6)
+    compass (0.11.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    cucumber (1.1.0)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    em-websocket (0.3.1)
+    em-websocket (0.3.8)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
-    ffi (1.0.9)
-    fssm (0.2.7)
-    gherkin (2.5.1)
+    ffi (1.1.4)
+    fssm (0.2.9)
+    gherkin (2.11.1)
       json (>= 1.4.6)
     git (1.2.5)
-    guard (0.8.4)
+    guard (0.8.8)
       thor (~> 0.14.6)
     guard-livereload (0.3.1)
       em-websocket (>= 0.2.0)
@@ -49,35 +46,33 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    less (2.0.7)
-      therubyracer (~> 0.9.2)
-    libv8 (3.3.10.2)
-    multi_json (1.0.3)
-    open4 (1.2.0)
-    rack (1.3.5)
-    rake (0.9.2)
-    rb-fsevent (0.4.3.1)
-    rcov (0.9.10)
-    rdiscount (1.6.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    sass (3.1.8)
-    sprockets (2.0.2)
+    json (1.6.7)
+    less (2.0.12)
+      commonjs (~> 0.2.0)
+      therubyracer (~> 0.9.9)
+    libv8 (3.3.10.4)
+    multi_json (1.0.4)
+    open4 (1.3.0)
+    rack (1.3.6)
+    rake (0.9.2.2)
+    rb-fsevent (0.9.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    rubyzip (0.9.9)
+    sass (3.1.20)
+    sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-sass (0.3.0)
       sprockets (~> 2.0)
-    term-ansicolor (1.0.6)
-    therubyracer (0.9.9)
+    therubyracer (0.9.10)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
@@ -98,8 +93,7 @@ DEPENDENCIES
   json (~> 1.6.1)
   less (~> 2.0.7)
   rack (~> 1.3.5)
-  rb-fsevent (~> 0.4.3.1)
-  rcov
+  rb-fsevent (~> 0.9.1)
   rspec
   rubyzip (~> 0.9.4)
   sass (~> 3.1.8)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/forge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forge"
-  s.version = "0.3.0"
+  s.version = "0.4.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 = "2011-12-09"
+  s.date = "2012-08-09"
   s.description = "A toolkit for bootstrapping and developing WordPress themes."
   s.email = "aadams@jestro.com"
   s.executables = ["forge"]
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://forge.thethemefoundry.com"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "A tool for developing wordpress themes"
 
   if s.respond_to? :specification_version then
@@ -91,14 +91,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, ["~> 1.3.5"])
       s.add_runtime_dependency(%q<guard-livereload>, ["~> 0.3.1"])
       s.add_runtime_dependency(%q<less>, ["~> 2.0.7"])
-      s.add_runtime_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+      s.add_runtime_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
       s.add_runtime_dependency(%q<yui-compressor>, ["~> 0.9.6"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<guard>, ["~> 0.8.4"])
@@ -111,14 +110,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack>, ["~> 1.3.5"])
       s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
       s.add_dependency(%q<less>, ["~> 2.0.7"])
-      s.add_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+      s.add_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
       s.add_dependency(%q<yui-compressor>, ["~> 0.9.6"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
@@ -132,14 +130,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, ["~> 1.3.5"])
     s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
     s.add_dependency(%q<less>, ["~> 2.0.7"])
-    s.add_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+    s.add_dependency(%q<rb-fsevent>, ["~> 0.9.1"])
     s.add_dependency(%q<yui-compressor>, ["~> 0.9.6"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/forge/builder.rb

@@ -94,6 +94,7 @@ module Forge
 
     def clean_functions
       FileUtils.rm File.join(@project.build_path, 'functions.php')
+      FileUtils.rm_rf File.join(@project.build_path, 'functions')
     end
 
     def copy_functions
@@ -106,6 +107,20 @@ module Forge
       elsif File.exists?(functions_php_path)
         FileUtils.cp functions_php_path, @project.build_path
       end
+
+      functions_paths = Dir.glob(File.join(@functions_path, '*')).reject do |filename|
+        [functions_erb_path, functions_php_path].include?(filename)
+      end
+
+      unless functions_paths.empty?
+        # Create the includes folder in the build directory
+        FileUtils.mkdir_p(File.join(@project.build_path, 'functions'))
+
+        # Iterate over all files in source/functions, skipping the actual functions.php file
+        paths = Dir.glob(File.join(@functions_path, '**', '*')).reject {|filename| [functions_erb_path, functions_php_path].include?(filename) }
+
+        copy_paths_with_erb(paths, @functions_path, File.join(@project.build_path, 'functions'))
+      end
     end
 
     def clean_includes
@@ -119,14 +134,7 @@ module Forge
 
         # Iterate over all files in source/includes, so we can exclude if necessary
         paths = Dir.glob(File.join(@includes_path, '**', '*'))
-        paths.each do |path|
-          # Remove @includes_path from full file path to get the relative path
-          relative_path = path.gsub(@includes_path, '')
-          destination = File.join(@project.build_path, 'includes', relative_path)
-
-          FileUtils.mkdir_p(destination) if File.directory?(path)
-          FileUtils.cp path, destination unless File.directory?(path)
-        end
+        copy_paths_with_erb(paths, @includes_path, File.join(@project.build_path, 'includes'))
       end
     end
 
@@ -188,10 +196,30 @@ module Forge
 
     private
 
+    def copy_paths_with_erb(paths, source_dir, destination_dir)
+      paths.each do |path|
+        # Remove source directory from full file path to get the relative path
+        relative_path = path.gsub(source_dir, '')
+
+        destination = File.join(destination_dir, relative_path)
+
+        if destination.end_with?('.erb')
+          # Remove the .erb extension if the path was an erb file
+          destination = destination.slice(0..-5)
+          # And process it as an erb
+          write_erb(path, destination)
+        else
+          # Otherwise, we simply move the file over
+          FileUtils.mkdir_p(destination) if File.directory?(path)
+          FileUtils.cp path, destination unless File.directory?(path)
+        end
+      end
+    end
+
     def init_sprockets
       @sprockets = Sprockets::Environment.new
 
-      ['javascripts', 'stylesheets'].each do |dir|
+      ['javascripts', 'stylesheets', 'lib'].each do |dir|
         @sprockets.append_path File.join(@assets_path, dir)
       end
 

data/lib/forge/config.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module Forge
   # Reads/Writes a configuration file in the user's home directory
   #

data/lib/forge/generator.rb

@@ -22,6 +22,7 @@ module Forge
         ['assets', 'images'],
         ['assets', 'javascripts'],
         ['assets', 'stylesheets'],
+        ['assets', 'lib'],
 
         ['functions'],
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153364900 !ruby/object:Gem::Requirement
+  requirement: &70165879419200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153364900
+  version_requirements: *70165879419200
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153364420 !ruby/object:Gem::Requirement
+  requirement: &70165879418640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153364420
+  version_requirements: *70165879418640
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2153363940 !ruby/object:Gem::Requirement
+  requirement: &70165879417920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153363940
+  version_requirements: *70165879417920
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2153363360 !ruby/object:Gem::Requirement
+  requirement: &70165879417300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153363360
+  version_requirements: *70165879417300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153362840 !ruby/object:Gem::Requirement
+  requirement: &70165879416700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153362840
+  version_requirements: *70165879416700
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153362260 !ruby/object:Gem::Requirement
+  requirement: &70165879416140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 3.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153362260
+  version_requirements: *70165879416140
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &2153361620 !ruby/object:Gem::Requirement
+  requirement: &70165879415580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153361620
+  version_requirements: *70165879415580
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2153360880 !ruby/object:Gem::Requirement
+  requirement: &70165879415000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153360880
+  version_requirements: *70165879415000
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153359980 !ruby/object:Gem::Requirement
+  requirement: &70165879414380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153359980
+  version_requirements: *70165879414380
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &2153358720 !ruby/object:Gem::Requirement
+  requirement: &70165879413700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153358720
+  version_requirements: *70165879413700
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &2153357400 !ruby/object:Gem::Requirement
+  requirement: &70165879412720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,21 +133,21 @@ dependencies:
         version: 2.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153357400
+  version_requirements: *70165879412720
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2153356400 !ruby/object:Gem::Requirement
+  requirement: &70165879411520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3.1
+        version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153356400
+  version_requirements: *70165879411520
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2153355300 !ruby/object:Gem::Requirement
+  requirement: &70165879410080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153355300
+  version_requirements: *70165879410080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153354600 !ruby/object:Gem::Requirement
+  requirement: &70165879408580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153354600
+  version_requirements: *70165879408580
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153353760 !ruby/object:Gem::Requirement
+  requirement: &70165879407700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153353760
+  version_requirements: *70165879407700
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153352880 !ruby/object:Gem::Requirement
+  requirement: &70165879406700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153352880
+  version_requirements: *70165879406700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153352080 !ruby/object:Gem::Requirement
+  requirement: &70165879405900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -199,10 +199,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153352080
+  version_requirements: *70165879405900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153351300 !ruby/object:Gem::Requirement
+  requirement: &70165879404980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -210,18 +210,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2153351300
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2153350460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153350460
+  version_requirements: *70165879404980
 description: A toolkit for bootstrapping and developing WordPress themes.
 email: aadams@jestro.com
 executables:
@@ -295,6 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3273590121676796914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tool for developing wordpress themes