henshin 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/henshin

@@ -64,7 +64,14 @@ else
   
   if ARGV[0]
     override['root'] = ARGV[0].split(':')[0]
-    override['target'] = ARGV[0].split(':')[1] if ARGV[0].split(':')[1]
+    if ARGV[0].split(':')[1]
+      override['target'] = ARGV[0].split(':')[1]
+    else
+      override['target'] = File.join(override['root'], Henshin::Defaults['target'])
+    end
+  else
+    override['root'] = Henshin::Defaults['root']
+    override['target'] = Henshin::Defaults['target']
   end
   
   
@@ -85,7 +92,7 @@ else
       
       threads << Thread.new {
         @h = Mongrel::HttpServer.new(build[:address], build[:port])
-        @h.register "/", Mongrel::DirHandler.new("test/site/_site")
+        @h.register("/", Mongrel::DirHandler.new(override['target']))
         puts "Server launched at http://#{build[:address]}:#{build[:port]}"
         trap("INT") { 
           @h.stop
@@ -99,7 +106,7 @@ else
       threads << Thread.new { 
         server = WEBrick::HTTPServer.new(
           :Port => build[:port],
-          :DocumentRoot => File.join(config[:root], config[:target]),
+          :DocumentRoot => override['target'],
           :MimeTypes => WEBrick::HTTPUtils::DefaultMimeTypes
         )
         trap("INT") { server.shutdown }
@@ -116,14 +123,14 @@ else
     puts "", "Auto-build initiated..."
     
     # build the glob pattern
-    gl = Dir[ File.join(site.config['root'], '*')].select { |x| File.directory?(x) }
+    gl = Dir[ File.join(override['root'], '*')].select { |x| File.directory?(x) }
     ['/_site', '/plugins'].each do |r|
-      gl = gl.select {|i| !i.include?( File.join(site.config['root'], r) )}
+      gl = gl.select {|i| !i.include?( File.join(override['root'], r) )}
     end
-    gl.collect! {|x| "#{x}/**/*"[site.config['root'].size+1..-1]}
+    gl.collect! {|x| "#{x}/**/*"[override['root'].size+1..-1]}
     gl += ['*']
 
-    dw = DirectoryWatcher.new(site.config['root'], :glob => gl)
+    dw = DirectoryWatcher.new(override['root'], :glob => gl)
     dw.interval = 1
     dw.add_observer do |*args| 
       if args.size > 1

data/henshin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{henshin}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hawx"]

data/lib/henshin/site.rb

@@ -14,22 +14,8 @@ module Henshin
     # @return [String] a path which should be prepended to all urls
     attr_accessor :base
     
-    # @return [Array]
-    attr_accessor :gens, :posts, :statics
-    
-    # @return [Hash{String => String}]
-    attr_accessor :layouts
-    
-    # @return [Tags]
-    attr_accessor :tags
-    
-    # @return [Categories]
-    attr_accessor :categories
-    
-    # @return [Archive]
-    attr_accessor :archive
-    
-    # @return [Hash{String => Plugin}]
+    attr_accessor :gens, :posts, :statics, :layouts
+    attr_accessor :tags, :categories, :archive
     attr_accessor :plugins
     
     # A new instance of site

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: henshin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - hawx