From 7c800d3b0753b76e0880853728ef87abd00e01ca Mon Sep 17 00:00:00 2001 From: edeustace Date: Thu, 23 Aug 2012 12:07:30 +0200 Subject: [PATCH 01/16] Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 --- bin/jekyll | 5 +++++ jekyll.gemspec | 7 +++++-- lib/jekyll.rb | 1 + lib/jekyll/site.rb | 18 ++++++++++++++++-- test/test_site.rb | 27 +++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index 74cb99b0..07769516 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -145,6 +145,11 @@ opts = OptionParser.new do |opts| puts "Jekyll " + Jekyll::VERSION exit 0 end + + opts.on( "--keep-files filename1,filename2", Array, "Whether to keep files that match the filename (default: .git)") do |names| + puts "keep-files option: #{names}" + options['keep_files'] = names + end end # Read command line options into `options` hash diff --git a/jekyll.gemspec b/jekyll.gemspec index 55201ae8..1c181122 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = 'jekyll' s.version = '0.11.2' - s.date = '2011-12-27' + s.date = '2012-08-23' s.rubyforge_project = 'jekyll' s.summary = "A simple, blog aware, static site generator." @@ -74,10 +74,12 @@ Gem::Specification.new do |s| lib/jekyll/migrators/csv.rb lib/jekyll/migrators/drupal.rb lib/jekyll/migrators/enki.rb + lib/jekyll/migrators/joomla.rb lib/jekyll/migrators/marley.rb lib/jekyll/migrators/mephisto.rb lib/jekyll/migrators/mt.rb lib/jekyll/migrators/posterous.rb + lib/jekyll/migrators/rss.rb lib/jekyll/migrators/textpattern.rb lib/jekyll/migrators/tumblr.rb lib/jekyll/migrators/typo.rb @@ -90,6 +92,7 @@ Gem::Specification.new do |s| lib/jekyll/static_file.rb lib/jekyll/tags/highlight.rb lib/jekyll/tags/include.rb + lib/jekyll/tags/post_url.rb test/helper.rb test/source/.htaccess test/source/_includes/sig.markdown @@ -141,9 +144,9 @@ Gem::Specification.new do |s| test/test_post.rb test/test_rdiscount.rb test/test_redcarpet.rb + test/test_redcloth.rb test/test_site.rb test/test_tags.rb - test/test_redcloth.rb ] # = MANIFEST = diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 65e16cdb..50125b08 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -59,6 +59,7 @@ module Jekyll 'source' => Dir.pwd, 'destination' => File.join(Dir.pwd, '_site'), 'plugins' => File.join(Dir.pwd, '_plugins'), + 'keep_files' => ['.git'], 'layouts' => '_layouts', 'future' => true, diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 8a78e915..b3490264 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -5,7 +5,8 @@ module Jekyll class Site attr_accessor :config, :layouts, :posts, :pages, :static_files, :categories, :exclude, :include, :source, :dest, :lsi, :pygments, - :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts + :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts, + :keep_files attr_accessor :converters, :generators @@ -26,6 +27,7 @@ module Jekyll self.include = config['include'] || [] self.future = config['future'] self.limit_posts = config['limit_posts'] || nil + self.keep_files = config['keep_files'] || [] self.reset self.setup @@ -217,7 +219,11 @@ module Jekyll # all files and directories in destination, including hidden ones dest_files = Set.new Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file| - dest_files << file unless file =~ /\/\.{1,2}$/ + if self.keep_files.length > 0 + dest_files << file unless file =~ /\/\.{1,2}$/ or file =~ keep_file_regex + else + dest_files << file unless file =~ /\/\.{1,2}$/ + end end # files to be written @@ -242,6 +248,14 @@ module Jekyll FileUtils.rm_rf(obsolete_files.to_a) end + # create a regex from the keep_files array + # ['.git','.svn'] => /\/(\.git|\/.svn)/ + def keep_file_regex + or_list = self.keep_files.map.inject("") { |x,y| "#{x}|#{y}" }[1..-1] + pattern = "\/(#{or_list.gsub(".", "\.")})" + Regexp.new pattern + end + # Write static files, pages, and posts. # # Returns nothing. diff --git a/test/test_site.rb b/test/test_site.rb index 712bf359..26bfaa52 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -180,6 +180,13 @@ class TestSite < Test::Unit::TestCase File.open(dest_dir('qux/obsolete.html'), 'w') # empty directory FileUtils.mkdir(dest_dir('quux')) + FileUtils.mkdir(dest_dir('.git')) + FileUtils.mkdir(dest_dir('.svn')) + FileUtils.mkdir(dest_dir('.hg')) + # single file in repository + File.open(dest_dir('.git/HEAD'), 'w') + File.open(dest_dir('.svn/HEAD'), 'w') + File.open(dest_dir('.hg/HEAD'), 'w') end teardown do @@ -187,6 +194,9 @@ class TestSite < Test::Unit::TestCase FileUtils.rm_f(dest_dir('obsolete.html')) FileUtils.rm_rf(dest_dir('qux')) FileUtils.rm_f(dest_dir('quux')) + FileUtils.rm_rf(dest_dir('.git')) + FileUtils.rm_rf(dest_dir('.svn')) + FileUtils.rm_rf(dest_dir('.hg')) end should 'remove orphaned files in destination' do @@ -195,6 +205,23 @@ class TestSite < Test::Unit::TestCase assert !File.exist?(dest_dir('obsolete.html')) assert !File.exist?(dest_dir('qux')) assert !File.exist?(dest_dir('quux')) + assert File.exist?(dest_dir('.git')) + assert File.exist?(dest_dir('.git/HEAD')) + end + + should 'remove orphaned files in destination - keep_files .svn' do + + config = Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']}) + @site = Site.new(config) + @site.process + assert !File.exist?(dest_dir('.htpasswd')) + assert !File.exist?(dest_dir('obsolete.html')) + assert !File.exist?(dest_dir('qux')) + assert !File.exist?(dest_dir('quux')) + assert !File.exist?(dest_dir('.git')) + assert !File.exist?(dest_dir('.git/HEAD')) + assert File.exist?(dest_dir('.svn')) + assert File.exist?(dest_dir('.svn/HEAD')) end end From 3da0bb3a7482004093d41fd6c4c2764cfb3cace2 Mon Sep 17 00:00:00 2001 From: edeustace Date: Thu, 23 Aug 2012 12:13:04 +0200 Subject: [PATCH 02/16] removed puts --- bin/jekyll | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/jekyll b/bin/jekyll index 07769516..03c26c22 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -147,7 +147,6 @@ opts = OptionParser.new do |opts| end opts.on( "--keep-files filename1,filename2", Array, "Whether to keep files that match the filename (default: .git)") do |names| - puts "keep-files option: #{names}" options['keep_files'] = names end end From 4bae42a671ba549bf05b2eabbcb8d3fcf26da430 Mon Sep 17 00:00:00 2001 From: edeustace Date: Sun, 9 Dec 2012 11:43:49 +0100 Subject: [PATCH 03/16] use Array.join instead of Array.inject, add .svn to defaults --- lib/jekyll.rb | 2 +- lib/jekyll/site.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 50125b08..f74e428b 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -59,7 +59,7 @@ module Jekyll 'source' => Dir.pwd, 'destination' => File.join(Dir.pwd, '_site'), 'plugins' => File.join(Dir.pwd, '_plugins'), - 'keep_files' => ['.git'], + 'keep_files' => ['.git','.svn'], 'layouts' => '_layouts', 'future' => true, diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index b3490264..058e6e11 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -251,7 +251,7 @@ module Jekyll # create a regex from the keep_files array # ['.git','.svn'] => /\/(\.git|\/.svn)/ def keep_file_regex - or_list = self.keep_files.map.inject("") { |x,y| "#{x}|#{y}" }[1..-1] + or_list = self.keep_files.join("|") pattern = "\/(#{or_list.gsub(".", "\.")})" Regexp.new pattern end From 6eed91871f24d081e5d9a7013dc1e8cf37e4e408 Mon Sep 17 00:00:00 2001 From: edeustace Date: Tue, 8 Jan 2013 23:17:06 +0100 Subject: [PATCH 04/16] Changes based on @mojombo's feedback --- jekyll.gemspec | 7 ++----- lib/jekyll/site.rb | 10 +++++++--- test/test_site.rb | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 1c181122..55201ae8 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.name = 'jekyll' s.version = '0.11.2' - s.date = '2012-08-23' + s.date = '2011-12-27' s.rubyforge_project = 'jekyll' s.summary = "A simple, blog aware, static site generator." @@ -74,12 +74,10 @@ Gem::Specification.new do |s| lib/jekyll/migrators/csv.rb lib/jekyll/migrators/drupal.rb lib/jekyll/migrators/enki.rb - lib/jekyll/migrators/joomla.rb lib/jekyll/migrators/marley.rb lib/jekyll/migrators/mephisto.rb lib/jekyll/migrators/mt.rb lib/jekyll/migrators/posterous.rb - lib/jekyll/migrators/rss.rb lib/jekyll/migrators/textpattern.rb lib/jekyll/migrators/tumblr.rb lib/jekyll/migrators/typo.rb @@ -92,7 +90,6 @@ Gem::Specification.new do |s| lib/jekyll/static_file.rb lib/jekyll/tags/highlight.rb lib/jekyll/tags/include.rb - lib/jekyll/tags/post_url.rb test/helper.rb test/source/.htaccess test/source/_includes/sig.markdown @@ -144,9 +141,9 @@ Gem::Specification.new do |s| test/test_post.rb test/test_rdiscount.rb test/test_redcarpet.rb - test/test_redcloth.rb test/test_site.rb test/test_tags.rb + test/test_redcloth.rb ] # = MANIFEST = diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 058e6e11..d8b729f9 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -220,7 +220,7 @@ module Jekyll dest_files = Set.new Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file| if self.keep_files.length > 0 - dest_files << file unless file =~ /\/\.{1,2}$/ or file =~ keep_file_regex + dest_files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex else dest_files << file unless file =~ /\/\.{1,2}$/ end @@ -248,8 +248,12 @@ module Jekyll FileUtils.rm_rf(obsolete_files.to_a) end - # create a regex from the keep_files array - # ['.git','.svn'] => /\/(\.git|\/.svn)/ + # Private: creates a regular expression from the keep_files array + # + # Examples + # ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/ + # + # Returns the regular expression def keep_file_regex or_list = self.keep_files.join("|") pattern = "\/(#{or_list.gsub(".", "\.")})" diff --git a/test/test_site.rb b/test/test_site.rb index 26bfaa52..833d7979 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -210,7 +210,6 @@ class TestSite < Test::Unit::TestCase end should 'remove orphaned files in destination - keep_files .svn' do - config = Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']}) @site = Site.new(config) @site.process From ba48870eadd48cdd2e2981a5904e164e915b2320 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 12:29:04 -0800 Subject: [PATCH 05/16] outputting full path when file does not parse --- lib/jekyll/convertible.rb | 4 ++-- test/test_convertible.rb | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index dab0545c..26f7a0c9 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -33,9 +33,9 @@ module Jekyll self.data = YAML.load($1) end rescue => e - puts "Error reading file #{name}: #{e.message}" + puts "Error reading file #{File.join(base,name)}: #{e.message}" rescue SyntaxError => e - puts "YAML Exception reading #{name}: #{e.message}" + puts "YAML Exception reading #{File.join(base,name)}: #{e.message}" end self.data ||= {} diff --git a/test/test_convertible.rb b/test/test_convertible.rb index b9a9e41c..3ad3c817 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -20,20 +20,26 @@ class TestConvertible < Test::Unit::TestCase end should "not parse if there is syntax error in front-matter" do + @name = 'broken_front_matter2.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, 'broken_front_matter2.erb') + ret = @convertible.read_yaml(@base, @name) assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) + assert_match(/#{@base}/, out) + assert_match(/#{@name}/, out) end if RUBY_VERSION >= '1.9.2' should "not parse if there is encoding error in file" do + @name = 'broken_front_matter3.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, 'broken_front_matter3.erb') + ret = @convertible.read_yaml(@base, @name) assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) + assert_match(/#{@base}/, out) + assert_match(/#{@name}/, out) end end end From 3e7f00ae1967c9f342e4b0c81707c1ab857f52a6 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 13:01:50 -0800 Subject: [PATCH 06/16] test the path, not the parts --- test/test_convertible.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 3ad3c817..80353a9d 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -26,8 +26,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{@base}/, out) - assert_match(/#{@name}/, out) + assert_match(/#{File.join(@base,@name)}/, out) end if RUBY_VERSION >= '1.9.2' @@ -38,8 +37,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{@base}/, out) - assert_match(/#{@name}/, out) + assert_match(/#{File.join(@base,@name)}/, out) end end end From cf42c566308c3473f0188e2f28e1250f1bb657a2 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 14:07:10 -0800 Subject: [PATCH 07/16] stick to good coding standards --- test/test_convertible.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index 80353a9d..b5afa86f 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -26,7 +26,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{File.join(@base,@name)}/, out) + assert_match(/#{File.join(@base, @name)}/, out) end if RUBY_VERSION >= '1.9.2' @@ -37,7 +37,7 @@ class TestConvertible < Test::Unit::TestCase assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{File.join(@base,@name)}/, out) + assert_match(/#{File.join(@base, @name)}/, out) end end end From a5c908ac3f3d55bf6ed25695831f9e5affbde0c4 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 10 Jan 2013 14:13:11 -0800 Subject: [PATCH 08/16] no good reason for making 'name' an instance variable --- test/test_convertible.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_convertible.rb b/test/test_convertible.rb index b5afa86f..82e4d27f 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -20,24 +20,24 @@ class TestConvertible < Test::Unit::TestCase end should "not parse if there is syntax error in front-matter" do - @name = 'broken_front_matter2.erb' + name = 'broken_front_matter2.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, @name) + ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end assert_match(/YAML Exception|syntax error/, out) - assert_match(/#{File.join(@base, @name)}/, out) + assert_match(/#{File.join(@base, name)}/, out) end if RUBY_VERSION >= '1.9.2' should "not parse if there is encoding error in file" do - @name = 'broken_front_matter3.erb' + name = 'broken_front_matter3.erb' out = capture_stdout do - ret = @convertible.read_yaml(@base, @name) + ret = @convertible.read_yaml(@base, name) assert_equal({}, ret) end assert_match(/invalid byte sequence in UTF-8/, out) - assert_match(/#{File.join(@base, @name)}/, out) + assert_match(/#{File.join(@base, name)}/, out) end end end From 7782e0b1a10a4719721df92ce413143e47353735 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Thu, 10 Jan 2013 21:44:08 -0600 Subject: [PATCH 09/16] Add a CONTRIBUTING file This uses the content of the 'Contribute' wiki page. --- CONTRIBUTING.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..fa6fb807 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,45 @@ +Contribute +========== + +So you've got an awesome idea to throw into Jekyll. Great! Please keep the following in mind: + +* **Contributions will not be accepted without tests.** +* If you're creating a small fix or patch to an existing feature, just a simple test will do. Please stay in the confines of the current test suite and use [Shoulda](http://github.com/thoughtbot/shoulda/tree/master) and [RR](http://github.com/btakita/rr/tree/master). +* If it's a brand new feature, make sure to create a new [Cucumber](https://github.com/cucumber/cucumber/) feature and reuse steps where appropriate. Also, whipping up some documentation in your fork's wiki would be appreciated, and once merged it will be transferred over to the main wiki. + +Test Dependencies +----------------- + +To run the test suite and build the gem you'll need to install Jekyll's dependencies. Jekyll uses Bundler, so a quick run of the bundle command and you're all set! + + $ bundle + +Before you start, run the tests and make sure that they pass (to confirm your environment is configured properly): + + $ rake test + $ rake features + +Workflow +-------- + +Here's the most direct way to get your work merged into the project: +* Fork the project +* Clone down your fork ( `git clone git://github.com//jekyll.git` ) +* Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ) +* Hack away, add tests. Not necessarily in that order. +* Make sure everything still passes by running `rake` +* If necessary, rebase your commits into logical chunks, without errors +* Push the branch up ( `git push origin my_awesome_feature` ) +* Create an issue with a description and link to your branch + +Gotchas +------- + +* If you want to bump the gem version, please put that in a separate commit. This way, the maintainers can control when the gem gets released. +* Try to keep your patch(es) based from the latest commit on mojombo/jekyll. The easier it is to apply your work, the less work the maintainers have to do, which is always a good thing. +* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers actively read the issues and will label it once they come across it. + +Finally... +---------- + +Thanks! Hacking on Jekyll should be fun, and if for some reason it's a pain to do let us know so we can fix it. From 6253f79de2ebebb5bfc8bf70f05ed92b570b0417 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 10 Jan 2013 22:11:13 -0800 Subject: [PATCH 10/16] Added space between arguments in Convertible errors --- lib/jekyll/convertible.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 26f7a0c9..e71fe1bf 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -33,9 +33,9 @@ module Jekyll self.data = YAML.load($1) end rescue => e - puts "Error reading file #{File.join(base,name)}: #{e.message}" + puts "Error reading file #{File.join(base, name)}: #{e.message}" rescue SyntaxError => e - puts "YAML Exception reading #{File.join(base,name)}: #{e.message}" + puts "YAML Exception reading #{File.join(base, name)}: #{e.message}" end self.data ||= {} From d2e750cc744a81398f56d1efd8840e38dac21a15 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 15:54:57 -0800 Subject: [PATCH 11/16] removed extraneous whitespace in test_site.rb --- test/test_site.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_site.rb b/test/test_site.rb index f71a9599..5462fd6e 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -240,7 +240,6 @@ class TestSite < Test::Unit::TestCase assert File.exist?(dest_dir('.svn')) assert File.exist?(dest_dir('.svn/HEAD')) end - end context 'with an invalid markdown processor in the configuration' do From 4336b6dd4ead43760adca1202c6ea2ddc6243376 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 15:55:14 -0800 Subject: [PATCH 12/16] Added Travis CI badge to README --- README.textile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.textile b/README.textile index 529e1e7d..80ca6220 100644 --- a/README.textile +++ b/README.textile @@ -1,5 +1,7 @@ h1. Jekyll +!https://travis-ci.org/mojombo/jekyll.png?branch=master!:https://travis-ci.org/mojombo/jekyll + By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind "GitHub Pages":http://pages.github.com, which you can use to host your project's page or blog right here from GitHub. From 36ba434115dedc5d1fc791c8e5dc460afc0a9f8b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 16:17:03 -0800 Subject: [PATCH 13/16] Updated history to reflected merged PRs, #745 and #685. --- History.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.txt b/History.txt index d65aad87..260c2661 100644 --- a/History.txt +++ b/History.txt @@ -1,5 +1,7 @@ == HEAD * Minor Enhancements + * "Keep files" feature (#685) + * Output full path & name for files that don't parse (#745) * Add source and destination directory protection (#535) * Better YAML error message (#718) * Bug Fixes From a8d07dd5f572e384f687bdf77a36d5c2fbff6979 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 16:21:31 -0800 Subject: [PATCH 14/16] Updating travis configuration to explicitly run 'rake' behind bundle exec. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 416e8f3a..b6b39b7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ +language: ruby rvm: - 1.9.3 - 1.9.2 - 1.8.7 +script: bundle exec rake From e4517c42af355f31745954c8d133a0461b3e2565 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 16:26:06 -0800 Subject: [PATCH 15/16] Specific patch version of 1.9.3: 362. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6b39b7d..152517e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 1.9.3 + - 1.9.3-p362 - 1.9.2 - 1.8.7 -script: bundle exec rake From 8b9baeee0e2fc8c7806e242448e7564ba8349375 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Jan 2013 16:45:17 -0800 Subject: [PATCH 16/16] Revert "Specific patch version of 1.9.3: 362." This reverts commit e4517c42af355f31745954c8d133a0461b3e2565. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 152517e5..b6b39b7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: ruby rvm: - - 1.9.3-p362 + - 1.9.3 - 1.9.2 - 1.8.7 +script: bundle exec rake