Skip to content

Commit

Permalink
Added an option to only copy public files and process css/js. Release…
Browse files Browse the repository at this point in the history
… 1.4.5
  • Loading branch information
benschwarz committed Feb 22, 2012
1 parent caf85e9 commit 7f09ec2
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 54 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.4
1.4.5
6 changes: 6 additions & 0 deletions bin/bonsai
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ opts = OptionParser.new do |opts|
Bonsai::Exporter.publish!
end

opts.on("--repot-assets", "only process the public, css and javascript, leave everything else as is") do
Bonsai.root_dir = Dir.pwd
Bonsai::Exporter.copy_public
Bonsai::Exporter.compress_assets
end

opts.on("-v", "--version") do
Bonsai.log "Version: #{Bonsai.version}"
end
Expand Down
64 changes: 28 additions & 36 deletions bonsai.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

Gem::Specification.new do |s|
s.name = %q{bonsai}
s.version = "1.4.4"
s.version = "1.4.5"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Ben Schwarz"]
s.date = %q{2012-02-19}
s.date = %q{2012-02-22}
s.default_executable = %q{bonsai}
s.description = %q{A static site generator that uses the best toolset available}
s.email = %q{ben.schwarz@gmail.com}
Expand Down Expand Up @@ -122,7 +122,6 @@ Gem::Specification.new do |s|
"spec/support/templates/partials/_magic.liquid",
"vendor/yui-compressor/yuicompressor-2.4.2.jar"
]
s.has_rdoc = false
s.homepage = %q{http://github.com/benschwarz/bonsai}
s.post_install_message = %q{
Expand Down Expand Up @@ -154,24 +153,21 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<bonsai>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_development_dependency(%q<rake>, [">= 0"])
Expand All @@ -189,24 +185,22 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<i18n>, [">= 0.5.0"])
s.add_runtime_dependency(%q<sass>, [">= 0"])
else
s.add_dependency(%q<bonsai>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])

s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.7.5"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.7.5"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
Expand All @@ -225,24 +219,22 @@ Gem::Specification.new do |s|
s.add_dependency(%q<sass>, [">= 0"])
end
else
s.add_dependency(%q<bonsai>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])

s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.7.5"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.7.5"])
s.add_dependency(%q<jeweler>, ["= 1.5.2"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<rake>, [">= 0"])
Expand Down
34 changes: 17 additions & 17 deletions lib/bonsai/exporter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,23 @@ def publish!
cleanup
end

def copy_public
generate_css

Bonsai.log "Copying public files"
# Using system call because fileutils is inadequate
system("cp -fR '#{Bonsai.root_dir}/public/.' '#{path}/.'")
end

def compress_assets
yui_compressor = File.expand_path("#{File.dirname(__FILE__)}/../../vendor/yui-compressor/yuicompressor-2.4.2.jar")

Bonsai.log "Compressing javascript and stylesheets"
Dir["#{path}/**/*.{js,css}"].each do |asset|
system "java -jar #{yui_compressor} #{File.expand_path(asset)} -o #{File.expand_path(asset)}"
end
end

protected
def teardown
FileUtils.rm_rf path
Expand Down Expand Up @@ -88,23 +105,6 @@ def copy_assets
end
end

def copy_public
generate_css

Bonsai.log "Copying public files"
# Using system call because fileutils is inadequate
system("cp -fR '#{Bonsai.root_dir}/public/.' '#{path}/.'")
end

def compress_assets
yui_compressor = File.expand_path("#{File.dirname(__FILE__)}/../../vendor/yui-compressor/yuicompressor-2.4.2.jar")

Bonsai.log "Compressing javascript and stylesheets"
Dir["#{path}/**/*.{js,css}"].each do |asset|
system "java -jar #{yui_compressor} #{File.expand_path(asset)} -o #{File.expand_path(asset)}"
end
end

def generate_css
Dir["#{Bonsai.root_dir}/public/**/*.{less,sass,scss}"].each do |cssfile|
css = Tilt.new(cssfile).render
Expand Down

0 comments on commit 7f09ec2

Please sign in to comment.