middleman 1.1.0.1 → 1.1.1.a

data/lib/middleman/templates.rb

@@ -19,13 +19,18 @@ module Middleman::Templates
     include Thor::Actions
     
     argument :location, :type => :string
-    class_option :css_dir, :default => "stylesheets", :desc => 'The path to the css files'
-    class_option :js_dir, :default => "javascripts", :desc => 'The path to the javascript files'
-    class_option :images_dir, :default => "images", :desc => 'The path to the image files'
+    class_option :template, :default => "default"
+    class_option :css_dir, :default => "stylesheets"
+    class_option :js_dir, :default => "javascripts"
+    class_option :images_dir, :default => "images"
   end
 end
 
 # Default template
 require "middleman/templates/default"
+
 # HTML5 template
-require "middleman/templates/html5"
+require "middleman/templates/html5"
+
+# Local templates
+require "middleman/templates/local"

data/lib/middleman/templates/local.rb

@@ -0,0 +1,20 @@
+module Middleman
+  def self.templates_path
+    File.join(`cd ~ && pwd`.chomp, ".middleman")
+  end
+end
+
+class Middleman::Templates::Local < Middleman::Templates::Base
+  def self.source_root
+    Middleman.templates_path
+  end
+
+  def build_scaffold
+    directory options[:template].to_s, location
+  end  
+end
+
+Dir[File.join(Middleman.templates_path, "*")].each do |dir|
+  next unless File.directory?(dir)
+  Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.0.1"
+  VERSION = "1.1.1.a"
 end

data/middleman.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass", ["0.11.beta.6"])
   s.add_runtime_dependency("chunky_png", ["~> 1.1.0"])
   s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("json_pure", ["~> 1.4.0"])
+  s.add_runtime_dependency("json", [">= 0"])
   s.add_runtime_dependency("smusher", ["~> 0.4.5"])
   s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: 
+  hash: 54
+  prerelease: 6
   segments: 
   - 1
   - 1
-  - 0
   - 1
-  version: 1.1.0.1
+  - a
+  version: 1.1.1.a
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -07:00
+date: 2011-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -263,19 +263,17 @@ dependencies:
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: json
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 4
         - 0
-        version: 1.4.0
+        version: "0"
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -509,6 +507,7 @@ files:
 - lib/middleman/templates/html5/public/js/plugins.js
 - lib/middleman/templates/html5/public/js/script.js
 - lib/middleman/templates/html5/public/robots.txt
+- lib/middleman/templates/local.rb
 - lib/middleman/version.rb
 - middleman.gemspec
 has_rdoc: true
@@ -532,12 +531,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: middleman