Skip to content

Commit

Permalink
fixed template resource issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Kim committed May 21, 2015
1 parent 3a22af6 commit e8ec59a
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 10 deletions.
2 changes: 1 addition & 1 deletion flavor_gem.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
spec.description = "Flavors bundler generated Rubygem and scaffolding"
spec.homepage = "http://github.com/iamdionysus/flavor_gem"

spec.files = %w(flavor_gem.gemspec) + Dir["*.md", "bin/*", "lib/**/*.rb", "lib/template/*"]
spec.files = %w(flavor_gem.gemspec) + Dir["*.md", "bin/*", "lib/**/*.rb", "template/*"]
spec.bindir = "bin"
spec.executables = %w(flavor-gem)
spec.require_paths = ["lib"]
Expand Down
8 changes: 7 additions & 1 deletion lib/flavor_gem/template/Rakefile
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
require "bundler/gem_tasks"
# added by flavor-gem generate minitest
require "rake/testtask"

Rake::TestTask.new do |t|
t.libs << "test"
t.pattern = "test/**/test_*.rb"
end
4 changes: 4 additions & 0 deletions lib/flavor_gem/thor_bin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ def create_runner_class(file_name = nil)
end

def create_bin_file(file_name = "bin/#{gem_name}")
if File.exist? file_name
puts "#{file_name} already exists, do nothing on it"
return
end
code = template_content "thor_bin"
code.gsub!(/@gem_name/, gem_name)
code.gsub!(/@gem_class_name/, gem_class_name)
Expand Down
2 changes: 1 addition & 1 deletion lib/flavor_gem/util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def append_template_to_file(file_name, template)
end

def template_file_name(template)
"lib/flavor_gem/template/#{template}"
"template/#{template}"
end

def template_content(template_name)
Expand Down
2 changes: 1 addition & 1 deletion lib/flavor_gem/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# version
module FlavorGem
VERSION = "0.1.6"
VERSION = "0.1.7"
end
10 changes: 8 additions & 2 deletions spec/lib/flavor_gem/thor_bin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,16 @@
let(:test_file_name) { subject.template_file_name "thor_bin_test" }
after(:example) { restore test_file_name }

it "creates bin file with gem name" do
it "creates bin file" do
backup test_file_name
expect { subject.create_bin_file test_file_name }
.to output(/#{subject.gem_name}/).to_stdout
.to output(/create/).to_stdout
end

it "does not create when it exists" do
backup test_file_name, copy: true
expect { subject.create_bin_file test_file_name }
.to output(/exists/).to_stdout
end
end
end
8 changes: 4 additions & 4 deletions spec/lib/flavor_gem/util_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ class Dummy < Thor

context "#file_include_code?" do
it "returns true when file includes code" do
result = subject.file_include_code? "lib/flavor_gem/template/bump.rake",
result = subject.file_include_code? "template/bump.rake",
"require 'flavor_gem/bump_tasks'"
expect(result).to be true
end
end

describe "#file_include_template?" do
it "returns true when file includes template" do
result = subject.file_include_template? "lib/flavor_gem/template/minitest.rake",
result = subject.file_include_template? "template/minitest.rake",
"minitest.rake"
expect(result).to be true
end
Expand All @@ -59,7 +59,7 @@ class Dummy < Thor

describe "#append_code_to_file" do
it "append to file when the file does not include code" do
rakefile = "lib/flavor_gem/template/Rakefile"
rakefile = "template/Rakefile"
code = File.read(subject.template_file_name("minitest.rake"))
FileUtils.cp rakefile, rakefile + ".bak"
subject.append_code_to_file rakefile, code
Expand All @@ -70,7 +70,7 @@ class Dummy < Thor
end

describe "#append_template_to_file" do
rakefile = "lib/flavor_gem/template/Rakefile"
rakefile = "template/Rakefile"
template = "minitest.rake"
it "creates file when the file does not exist" do
FileUtils.mv rakefile, rakefile + ".bak"
Expand Down
1 change: 1 addition & 0 deletions template/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require "bundler/gem_tasks"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit e8ec59a

Please sign in to comment.