hx 0.8.3 → 0.8.4

data/Rakefile

@@ -15,7 +15,7 @@ EOS
     gem.email = "mental@rydia.net"
     gem.homepage = "http://github.com/mental/hx"
     gem.authors = ["MenTaLguY"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -23,15 +23,13 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = "--color"
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.rspec_opts = "--color"
   spec.rcov = true
 end
 

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/hx.rb

@@ -541,22 +541,24 @@ class Site
   end
 end
 
-def self.refresh_file(pathname, content, update_time)
+def self.refresh_file(pathname, content, update_time, executable=false)
   begin
     return false if update_time and update_time < pathname.mtime
   rescue Errno::ENOENT
   end
-  write_file(pathname, content)
+  write_file(pathname, content, executable)
   true
 end
 
-def self.write_file(pathname, content)
+def self.write_file(pathname, content, executable=false)
   parent = pathname.parent
   parent.mkpath()
   tempfile = Tempfile.new('.hx-out', parent.to_s)
   begin
     File.open(tempfile.path, "wb") { |stream| stream << content.to_s }
-    File.chmod(0666 & ~File.umask, tempfile.path)
+    base_mode = 0666
+    base_mode |= 0111 if executable
+    File.chmod(base_mode & ~File.umask, tempfile.path)
     File.rename(tempfile.path, pathname.to_s)
   ensure
     tempfile.unlink

data/lib/hx/backend/rawfiles.rb

@@ -68,6 +68,7 @@ class RawFiles
     pathname = path_to_pathname(path)
     begin
       { 'updated' => pathname.mtime,
+        'executable' => pathname.executable?,
         'content' => Hx::LazyContent.new { pathname.read } }
     rescue Errno::ENOENT
       raise Hx::NoSuchEntryError, path

data/lib/hx/cli.rb

@@ -114,7 +114,8 @@ def self.do_gen(site, update_only)
     else
       update_time = nil
     end
-    written = Hx.refresh_file(pathname, content, update_time)
+    written = Hx.refresh_file(pathname, content, update_time,
+                              entry['executable'])
     puts "===> #{path}" if written
   end
 end

data/spec/rawfiles_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'hx/backend/rawfiles'
+require 'enumerator'
+require 'set'
+require 'tmpdir'
+
+describe Hx::Backend::RawFiles do
+  before :each do
+    @dir = Dir.mktmpdir
+    @input = Hx::Backend::RawFiles.new(Hx::NULL_INPUT, {:entry_dir => @dir})
+  end
+
+  after :each do
+    FileUtils.rm_rf @dir
+  end
+
+  it "should retrieve file content" do
+    content = "foobar"
+    File.open(File.join(@dir, 'test'), 'w') { |s| s.write(content) }
+    @input.get_entry('test')['content'].to_s.should == content
+  end
+
+  it "should enumerate files" do
+    entry_names = Set.new %q(foo bar baz)
+    for name in entry_names
+      File.open(File.join(@dir, name), 'w') {}
+    end
+    enum = Enumerable::Enumerator.new(@input, :each_entry_path, Hx::Path::ALL)
+    Set.new(enum).should == entry_names
+  end
+
+  it "should retreive file content lazily" do
+    real_content = "foobar"
+    File.open(File.join(@dir, 'test'), 'w') { |s| s.write("blargh") }
+    entry_content = @input.get_entry('test')['content']
+    File.open(File.join(@dir, 'test'), 'w') { |s| s.write(real_content) }
+    entry_content.to_s.should == real_content
+  end
+
+  it "should retrieve file mtime" do
+    File.open(File.join(@dir, 'test'), 'w') {}
+    time = Time.at(0)
+    File.utime(time, time, File.join(@dir, 'test'))
+    @input.get_entry('test')['updated'].should == time
+  end
+
+  it "should return the executable bit" do
+    File.open(File.join(@dir, 'regular'), 'w') {}
+    File.open(File.join(@dir, 'executable'), 'w') { |s| s.chmod(0775) }
+    @input.get_entry('regular')['executable'].should be_false
+    @input.get_entry('executable')['executable'].should be_true
+  end
+end

data/spec/spec_helper.rb

@@ -2,8 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'hx'
 require 'ostruct'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 begin
 require 'rubygems'
 rescue LoadError
@@ -36,12 +35,8 @@ class FakeInput
   end
 end
 
-Spec::Matchers.define :accept do |value|
+RSpec::Matchers.define :accept do |value|
   match do |acceptor|
     acceptor.accept?(value)
   end
 end
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  hash: 55
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - MenTaLguY
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -04:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id001
 description: |
   Hx is a simple static site generator in the spirit of Hobix which reads a
   YAML configuration file, constructs a filter graph, and generates output
@@ -38,7 +50,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -64,6 +75,7 @@ files:
 - spec/overlay_spec.rb
 - spec/pathops_spec.rb
 - spec/rack_spec.rb
+- spec/rawfiles_spec.rb
 - spec/selector_spec.rb
 - spec/site_spec.rb
 - spec/spec.opts
@@ -73,37 +85,44 @@ homepage: http://github.com/mental/hx
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A miniature static site generator.
 test_files: 
-- spec/spec_helper.rb
 - spec/cache_spec.rb
 - spec/hx_dummy.rb
-- spec/nullinput_spec.rb
-- spec/site_spec.rb
 - spec/hx_dummy2.rb
-- spec/rack_spec.rb
+- spec/nullinput_spec.rb
 - spec/overlay_spec.rb
 - spec/pathops_spec.rb
+- spec/rack_spec.rb
+- spec/rawfiles_spec.rb
 - spec/selector_spec.rb
+- spec/site_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC