jeweler 2.1.2 → 2.2.1

data/Rakefile

@@ -25,12 +25,11 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = 'http://github.com/technicalpickles/jeweler'
   gem.summary = 'Opinionated tool for creating and managing RubyGem projects'
   gem.description = 'Simple and opinionated helper for creating Rubygem projects on GitHub'
+  gem.required_ruby_version = '>= 2.2.2'
   gem.license = 'MIT'
   gem.authors = ["Fred Mitchell", "Josh Nichols", "Yusuke Murata"]
   gem.email = ["fred.mitchell@gmx.de", "fred.mitchell@gmx.com", "info@muratayusuke.com"]
   gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
-
-  # dependencies defined in Gemfile
 end
 
 Jeweler::RubygemsDotOrgTasks.new

data/jeweler.gemspec

@@ -2,23 +2,24 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jeweler 2.1.2 ruby lib
+# stub: jeweler 2.2.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "jeweler"
-  s.version = "2.1.2"
+  s.name = "jeweler".freeze
+  s.version = "2.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Fred Mitchell", "Josh Nichols", "Yusuke Murata"]
-  s.date = "2016-10-22"
-  s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-  s.email = ["fred.mitchell@gmx.de", "fred.mitchell@gmx.com", "info@muratayusuke.com"]
-  s.executables = ["jeweler"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Fred Mitchell".freeze, "Josh Nichols".freeze, "Yusuke Murata".freeze]
+  s.date = "2016-11-21"
+  s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub".freeze
+  s.email = ["fred.mitchell@gmx.de".freeze, "fred.mitchell@gmx.com".freeze, "info@muratayusuke.com".freeze]
+  s.executables = ["jeweler".freeze]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
     "LICENSE.txt",
-    "README.markdown"
+    "README.markdown",
+    "README.org"
   ]
   s.files = [
     ".coveralls.yml",
@@ -29,11 +30,10 @@ Gem::Specification.new do |s|
     "ChangeLog.markdown",
     "Gemfile",
     "Gemfile.lock",
-    "Gemfile.orig",
     "LICENSE.txt",
     "README.markdown",
+    "README.org",
     "Rakefile",
-    "Rakefile.orig",
     "bin/jeweler",
     "features/generator/cucumber.feature",
     "features/generator/directory_layout.feature",
@@ -56,7 +56,6 @@ Gem::Specification.new do |s|
     "features/tasks/version.feature",
     "features/tasks/version_bumping.feature",
     "jeweler.gemspec",
-    "jeweler.gemspec.orig",
     "lib/jeweler.rb",
     "lib/jeweler/commands.rb",
     "lib/jeweler/commands/build_gem.rb",
@@ -189,57 +188,61 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test/test_jeweler.rb"
   ]
-  s.homepage = "http://github.com/technicalpickles/jeweler"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Opinionated tool for creating and managing RubyGem projects"
+  s.homepage = "http://github.com/technicalpickles/jeweler".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2".freeze)
+  s.rubygems_version = "2.6.7".freeze
+  s.summary = "Opinionated tool for creating and managing RubyGem projects".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.10"])
-      s.add_runtime_dependency(%q<github_api>, ["~> 0.11.0"])
-      s.add_runtime_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_runtime_dependency(%q<bundler>, [">= 1.0"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<semver>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.5"])
-      s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 1.1.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<git>.freeze, [">= 1.2.5"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+      s.add_runtime_dependency(%q<github_api>.freeze, ["~> 0.11.0"])
+      s.add_runtime_dependency(%q<highline>.freeze, [">= 1.6.15"])
+      s.add_runtime_dependency(%q<bundler>.freeze, [">= 1.0"])
+      s.add_runtime_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<semver>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<psych>.freeze, ["~> 2.2"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0.8.5"])
+      s.add_development_dependency(%q<bluecloth>.freeze, [">= 0"])
+      s.add_development_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 1.2.5"])
-      s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
-      s.add_dependency(%q<github_api>, ["~> 0.11.0"])
-      s.add_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_dependency(%q<bundler>, [">= 1.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<semver>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0.8.5"])
-      s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 1.1.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<git>.freeze, [">= 1.2.5"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+      s.add_dependency(%q<github_api>.freeze, ["~> 0.11.0"])
+      s.add_dependency(%q<highline>.freeze, [">= 1.6.15"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_dependency(%q<semver>.freeze, [">= 0"])
+      s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
+      s.add_dependency(%q<yard>.freeze, [">= 0.8.5"])
+      s.add_dependency(%q<bluecloth>.freeze, [">= 0"])
+      s.add_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 1.2.5"])
-    s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
-    s.add_dependency(%q<github_api>, ["~> 0.11.0"])
-    s.add_dependency(%q<highline>, [">= 1.6.15"])
-    s.add_dependency(%q<bundler>, [">= 1.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<semver>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0.8.5"])
-    s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 1.1.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 1.2.5"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+    s.add_dependency(%q<github_api>.freeze, ["~> 0.11.0"])
+    s.add_dependency(%q<highline>.freeze, [">= 1.6.15"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<builder>.freeze, [">= 0"])
+    s.add_dependency(%q<semver>.freeze, [">= 0"])
+    s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
+    s.add_dependency(%q<yard>.freeze, [">= 0.8.5"])
+    s.add_dependency(%q<bluecloth>.freeze, [">= 0"])
+    s.add_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeweler
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Fred Mitchell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,7 @@ extra_rdoc_files:
 - ChangeLog.markdown
 - LICENSE.txt
 - README.markdown
+- README.org
 files:
 - ".coveralls.yml"
 - ".document"
@@ -215,11 +230,10 @@ files:
 - ChangeLog.markdown
 - Gemfile
 - Gemfile.lock
-- Gemfile.orig
 - LICENSE.txt
 - README.markdown
+- README.org
 - Rakefile
-- Rakefile.orig
 - bin/jeweler
 - features/generator/cucumber.feature
 - features/generator/directory_layout.feature
@@ -242,7 +256,6 @@ files:
 - features/tasks/version.feature
 - features/tasks/version_bumping.feature
 - jeweler.gemspec
-- jeweler.gemspec.orig
 - lib/jeweler.rb
 - lib/jeweler/commands.rb
 - lib/jeweler/commands/build_gem.rb
@@ -386,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -394,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Opinionated tool for creating and managing RubyGem projects

data/Gemfile.orig

@@ -1,54 +0,0 @@
-<<<<<<< HEAD
-source "http://rubygems.org"
-
-gem "rake"
-gem "git", ">= 1.2.5"
-gem "nokogiri", ">= 1.5.10"
-gem "github_api"
-gem "highline", ">= 1.6.15"
-gem "bundler", ">= 1.0"
-gem "rdoc"
-gem "builder"
-gem "semver"
-=======
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'git', '>= 1.2.5'
-gem 'nokogiri', '>= 1.5.10'
-gem 'github_api', '~> 0.11.0'
-gem 'highline', '>= 1.6.15'
-gem 'bundler', '>= 1.0'
-gem 'rdoc'
-gem 'builder'
->>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
-
-group :development do
-  gem 'yard', '>= 0.8.5'
-  gem 'bluecloth'
-  gem 'cucumber', '>= 1.1.4'
-  gem 'simplecov'
-end
-
-group :test do
-  gem 'timecop'
-  gem 'activesupport', '~> 3.2.16'
-  gem 'shoulda', require: false
-  gem 'mhennemeyer-output_catcher'
-  gem 'mocha', require: false
-  gem 'redgreen'
-  gem 'test_construct'
-  gem 'coveralls', require: false
-  gem 'test-unit-rr', require: false
-end
-
-# yo dawg, i herd u lieked jeweler
-group :xzibit do
-  # steal a page from bundler's gemspec:
-  # add this directory as jeweler, in order to bundle exec jeweler and use the current working directory
-  gem 'jeweler', path: '.'
-end
-
-group :debug do
-  gem 'test-unit'
-end

data/Rakefile.orig

@@ -1,88 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-require 'semver'
-
-def s_version
-  SemVer.find.format "%M.%m.%p%s"
-end
-
-begin
-  Bundler.setup(:default, :xzibit, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
-  exit e.status_code
-end
-
-require 'rake'
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-<<<<<<< HEAD
-  gem.name = "jeweler"
-  gem.version = s_version
-  gem.homepage = "http://github.com/technicalpickles/jeweler"
-  gem.summary = "Opinionated tool for creating and managing RubyGem projects"
-  gem.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-  gem.license = "MIT"
-  gem.authors = ["Fred Mitchell", "Josh Nichols", "Yusuke Murata"]
-  gem.email = ["fred.mitchell@gmx.de", "fred.mitchell@gmx.com", "info@muratayusuke.com"]
-=======
-  gem.name = 'jeweler'
-  gem.version = Jeweler::Version::STRING
-  gem.homepage = 'http://github.com/technicalpickles/jeweler'
-  gem.summary = 'Opinionated tool for creating and managing RubyGem projects'
-  gem.description = 'Simple and opinionated helper for creating Rubygem projects on GitHub'
-  gem.license = 'MIT'
-  gem.authors = ['Josh Nichols', 'Yusuke Murata']
-  gem.email = ['josh@technicalpickles.com', 'info@muratayusuke.com']
->>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
-  gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
-
-  # dependencies defined in Gemfile
-end
-
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.test_files = FileList.new('test/**/test_*.rb') do |list|
-    list.exclude 'test/test_helper.rb'
-    list.exclude 'test/fixtures/**/*.rb'
-  end
-  test.libs << 'test'
-  test.verbose = true
-end
-
-namespace :test do
-  task :gemspec_dup do
-    gemspec = Rake.application.jeweler.gemspec
-    dupped_gemspec = gemspec.dup
-    _cloned_gemspec = gemspec.clone
-    puts gemspec.to_ruby
-    puts dupped_gemspec.to_ruby
-  end
-end
-
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  t.files = FileList['lib/**/*.rb'].exclude('lib/jeweler/templates/**/*.rb')
-end
-
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features) do |features|
-  features.cucumber_opts = 'features --format progress'
-end
-namespace :features do
-  Cucumber::Rake::Task.new(:pretty) do |features|
-    features.cucumber_opts = 'features --format progress'
-  end
-end
-
-if ENV['RUN_CODE_RUN'] == 'true'
-  task default: [:test, :features]
-else
-  task default: :test
-end

data/jeweler.gemspec.orig

@@ -1,464 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: jeweler 2.1.1 ruby lib
-
-Gem::Specification.new do |s|
-<<<<<<< HEAD
-  s.name = "jeweler"
-  s.version = "2.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Fred Mitchell", "Josh Nichols", "Yusuke Murata"]
-  s.date = "2016-04-04"
-  s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-  s.email = ["fred.mitchell@gmx.de", "fred.mitchell@gmx.com", "info@muratayusuke.com"]
-  s.executables = ["jeweler"]
-=======
-  s.name = 'jeweler'
-  s.version = '2.0.1'
-
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.authors = ['Josh Nichols', 'Yusuke Murata']
-  s.date = '2014-01-29'
-  s.description = 'Simple and opinionated helper for creating Rubygem projects on GitHub'
-  s.email = ['josh@technicalpickles.com', 'info@muratayusuke.com']
-  s.executables = ['jeweler']
->>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
-  s.extra_rdoc_files = [
-    'ChangeLog.markdown',
-    'LICENSE.txt',
-    'README.markdown'
-  ]
-  s.files = [
-<<<<<<< HEAD
-    ".coveralls.yml",
-    ".document",
-    ".semver",
-    ".travis.yml",
-    ".yardopts",
-    "ChangeLog.markdown",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.markdown",
-    "Rakefile",
-    "bin/jeweler",
-    "features/generator/cucumber.feature",
-    "features/generator/directory_layout.feature",
-    "features/generator/dotdocument.feature",
-    "features/generator/env_options.feature",
-    "features/generator/gemfile.feature",
-    "features/generator/git.feature",
-    "features/generator/license.feature",
-    "features/generator/rakefile.feature",
-    "features/generator/readme.feature",
-    "features/generator/test.feature",
-    "features/generator/test_helper.feature",
-    "features/placeholder.feature",
-    "features/step_definitions/debug_steps.rb",
-    "features/step_definitions/filesystem_steps.rb",
-    "features/step_definitions/generator_steps.rb",
-    "features/step_definitions/task_steps.rb",
-    "features/support/env.rb",
-    "features/tasks/build_gem.feature",
-    "features/tasks/version.feature",
-    "features/tasks/version_bumping.feature",
-    "jeweler.gemspec",
-    "lib/jeweler.rb",
-    "lib/jeweler/commands.rb",
-    "lib/jeweler/commands/build_gem.rb",
-    "lib/jeweler/commands/check_dependencies.rb",
-    "lib/jeweler/commands/install_gem.rb",
-    "lib/jeweler/commands/release_gemspec.rb",
-    "lib/jeweler/commands/release_to_git.rb",
-    "lib/jeweler/commands/release_to_rubygems.rb",
-    "lib/jeweler/commands/validate_gemspec.rb",
-    "lib/jeweler/commands/version/base.rb",
-    "lib/jeweler/commands/version/bump_major.rb",
-    "lib/jeweler/commands/version/bump_minor.rb",
-    "lib/jeweler/commands/version/bump_patch.rb",
-    "lib/jeweler/commands/version/write.rb",
-    "lib/jeweler/commands/write_gemspec.rb",
-    "lib/jeweler/errors.rb",
-    "lib/jeweler/gemcutter_tasks.rb",
-    "lib/jeweler/gemspec_helper.rb",
-    "lib/jeweler/generator.rb",
-    "lib/jeweler/generator/application.rb",
-    "lib/jeweler/generator/bacon_mixin.rb",
-    "lib/jeweler/generator/github_mixin.rb",
-    "lib/jeweler/generator/micronaut_mixin.rb",
-    "lib/jeweler/generator/minitest_mixin.rb",
-    "lib/jeweler/generator/options.rb",
-    "lib/jeweler/generator/rdoc_mixin.rb",
-    "lib/jeweler/generator/riot_mixin.rb",
-    "lib/jeweler/generator/rspec_mixin.rb",
-    "lib/jeweler/generator/shindo_mixin.rb",
-    "lib/jeweler/generator/shoulda_mixin.rb",
-    "lib/jeweler/generator/testspec_mixin.rb",
-    "lib/jeweler/generator/testunit_mixin.rb",
-    "lib/jeweler/generator/yard_mixin.rb",
-    "lib/jeweler/rubyforge_tasks.rb",
-    "lib/jeweler/rubygems_dot_org_tasks.rb",
-    "lib/jeweler/rubygems_tasks.rb",
-    "lib/jeweler/specification.rb",
-    "lib/jeweler/tasks.rb",
-    "lib/jeweler/templates/.document",
-    "lib/jeweler/templates/.gitignore",
-    "lib/jeweler/templates/Gemfile",
-    "lib/jeweler/templates/LICENSE.txt",
-    "lib/jeweler/templates/README.rdoc",
-    "lib/jeweler/templates/Rakefile",
-    "lib/jeweler/templates/bacon/flunking.rb",
-    "lib/jeweler/templates/bacon/helper.rb",
-    "lib/jeweler/templates/bundler_setup.erb",
-    "lib/jeweler/templates/features/default.feature",
-    "lib/jeweler/templates/features/support/env.rb",
-    "lib/jeweler/templates/jeweler_tasks.erb",
-    "lib/jeweler/templates/micronaut/flunking.rb",
-    "lib/jeweler/templates/micronaut/helper.rb",
-    "lib/jeweler/templates/minitest/flunking.rb",
-    "lib/jeweler/templates/minitest/helper.rb",
-    "lib/jeweler/templates/other_tasks.erb",
-    "lib/jeweler/templates/riot/flunking.rb",
-    "lib/jeweler/templates/riot/helper.rb",
-    "lib/jeweler/templates/rspec/.rspec",
-    "lib/jeweler/templates/rspec/flunking.rb",
-    "lib/jeweler/templates/rspec/helper.rb",
-    "lib/jeweler/templates/shindo/flunking.rb",
-    "lib/jeweler/templates/shindo/helper.rb",
-    "lib/jeweler/templates/shoulda/flunking.rb",
-    "lib/jeweler/templates/shoulda/helper.rb",
-    "lib/jeweler/templates/simplecov.erb",
-    "lib/jeweler/templates/testspec/flunking.rb",
-    "lib/jeweler/templates/testspec/helper.rb",
-    "lib/jeweler/templates/testunit/flunking.rb",
-    "lib/jeweler/templates/testunit/helper.rb",
-    "lib/jeweler/version.rb",
-    "lib/jeweler/version_helper.rb",
-    "test/fixtures/bar/VERSION.yml",
-    "test/fixtures/bar/bin/foo_the_ultimate_bin",
-    "test/fixtures/bar/hey_include_me_in_gemspec",
-    "test/fixtures/bar/lib/foo_the_ultimate_lib.rb",
-    "test/fixtures/existing-project-with-version-constant/.document",
-    "test/fixtures/existing-project-with-version-constant/.gitignore",
-    "test/fixtures/existing-project-with-version-constant/LICENSE.txt",
-    "test/fixtures/existing-project-with-version-constant/README.rdoc",
-    "test/fixtures/existing-project-with-version-constant/Rakefile",
-    "test/fixtures/existing-project-with-version-constant/existing-project-with-version.gemspec",
-    "test/fixtures/existing-project-with-version-constant/lib/existing_project_with_version.rb",
-    "test/fixtures/existing-project-with-version-constant/test/existing_project_with_version_test.rb",
-    "test/fixtures/existing-project-with-version-constant/test/test_helper.rb",
-    "test/fixtures/existing-project-with-version-plaintext/.document",
-    "test/fixtures/existing-project-with-version-plaintext/.gitignore",
-    "test/fixtures/existing-project-with-version-plaintext/LICENSE.txt",
-    "test/fixtures/existing-project-with-version-plaintext/README.rdoc",
-    "test/fixtures/existing-project-with-version-plaintext/Rakefile",
-    "test/fixtures/existing-project-with-version-plaintext/VERSION",
-    "test/fixtures/existing-project-with-version-plaintext/existing-project-with-version.gemspec",
-    "test/fixtures/existing-project-with-version-plaintext/lib/existing_project_with_version.rb",
-    "test/fixtures/existing-project-with-version-plaintext/test/existing_project_with_version_test.rb",
-    "test/fixtures/existing-project-with-version-plaintext/test/test_helper.rb",
-    "test/fixtures/existing-project-with-version-yaml/.document",
-    "test/fixtures/existing-project-with-version-yaml/.gitignore",
-    "test/fixtures/existing-project-with-version-yaml/LICENSE.txt",
-    "test/fixtures/existing-project-with-version-yaml/README.rdoc",
-    "test/fixtures/existing-project-with-version-yaml/Rakefile",
-    "test/fixtures/existing-project-with-version-yaml/VERSION.yml",
-    "test/fixtures/existing-project-with-version-yaml/bin/foo_the_ultimate_bin",
-    "test/fixtures/existing-project-with-version-yaml/existing-project-with-version.gemspec",
-    "test/fixtures/existing-project-with-version-yaml/lib/existing_project_with_version.rb",
-    "test/fixtures/existing-project-with-version-yaml/test/existing_project_with_version_test.rb",
-    "test/fixtures/existing-project-with-version-yaml/test/test_helper.rb",
-    "test/geminstaller.yml",
-    "test/jeweler/commands/test_build_gem.rb",
-    "test/jeweler/commands/test_install_gem.rb",
-    "test/jeweler/commands/test_release_to_gemcutter.rb",
-    "test/jeweler/commands/test_release_to_git.rb",
-    "test/jeweler/commands/test_release_to_github.rb",
-    "test/jeweler/commands/test_validate_gemspec.rb",
-    "test/jeweler/commands/test_write_gemspec.rb",
-    "test/jeweler/commands/version/test_base.rb",
-    "test/jeweler/commands/version/test_bump_major.rb",
-    "test/jeweler/commands/version/test_bump_minor.rb",
-    "test/jeweler/commands/version/test_bump_patch.rb",
-    "test/jeweler/commands/version/test_write.rb",
-    "test/jeweler/generator/test_application.rb",
-    "test/jeweler/generator/test_options.rb",
-    "test/jeweler/test_gemspec_helper.rb",
-    "test/jeweler/test_generator.rb",
-    "test/jeweler/test_generator_initialization.rb",
-    "test/jeweler/test_generator_mixins.rb",
-    "test/jeweler/test_specification.rb",
-    "test/jeweler/test_tasks.rb",
-    "test/jeweler/test_version_helper.rb",
-    "test/shoulda_macros/jeweler_macros.rb",
-    "test/test_helper.rb",
-    "test/test_jeweler.rb"
-  ]
-  s.homepage = "http://github.com/technicalpickles/jeweler"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Opinionated tool for creating and managing RubyGem projects"
-=======
-    '.coveralls.yml',
-    '.document',
-    '.travis.yml',
-    '.yardopts',
-    'ChangeLog.markdown',
-    'Gemfile',
-    'LICENSE.txt',
-    'README.markdown',
-    'Rakefile',
-    'bin/jeweler',
-    'features/generator/cucumber.feature',
-    'features/generator/directory_layout.feature',
-    'features/generator/dotdocument.feature',
-    'features/generator/env_options.feature',
-    'features/generator/gemfile.feature',
-    'features/generator/git.feature',
-    'features/generator/license.feature',
-    'features/generator/rakefile.feature',
-    'features/generator/readme.feature',
-    'features/generator/test.feature',
-    'features/generator/test_helper.feature',
-    'features/placeholder.feature',
-    'features/step_definitions/debug_steps.rb',
-    'features/step_definitions/filesystem_steps.rb',
-    'features/step_definitions/generator_steps.rb',
-    'features/step_definitions/task_steps.rb',
-    'features/support/env.rb',
-    'features/tasks/build_gem.feature',
-    'features/tasks/version.feature',
-    'features/tasks/version_bumping.feature',
-    'jeweler.gemspec',
-    'lib/jeweler.rb',
-    'lib/jeweler/commands.rb',
-    'lib/jeweler/commands/build_gem.rb',
-    'lib/jeweler/commands/check_dependencies.rb',
-    'lib/jeweler/commands/install_gem.rb',
-    'lib/jeweler/commands/release_gemspec.rb',
-    'lib/jeweler/commands/release_to_git.rb',
-    'lib/jeweler/commands/release_to_rubygems.rb',
-    'lib/jeweler/commands/validate_gemspec.rb',
-    'lib/jeweler/commands/version/base.rb',
-    'lib/jeweler/commands/version/bump_major.rb',
-    'lib/jeweler/commands/version/bump_minor.rb',
-    'lib/jeweler/commands/version/bump_patch.rb',
-    'lib/jeweler/commands/version/write.rb',
-    'lib/jeweler/commands/write_gemspec.rb',
-    'lib/jeweler/errors.rb',
-    'lib/jeweler/gemcutter_tasks.rb',
-    'lib/jeweler/gemspec_helper.rb',
-    'lib/jeweler/generator.rb',
-    'lib/jeweler/generator/application.rb',
-    'lib/jeweler/generator/bacon_mixin.rb',
-    'lib/jeweler/generator/github_mixin.rb',
-    'lib/jeweler/generator/micronaut_mixin.rb',
-    'lib/jeweler/generator/minitest_mixin.rb',
-    'lib/jeweler/generator/options.rb',
-    'lib/jeweler/generator/rdoc_mixin.rb',
-    'lib/jeweler/generator/riot_mixin.rb',
-    'lib/jeweler/generator/rspec_mixin.rb',
-    'lib/jeweler/generator/shindo_mixin.rb',
-    'lib/jeweler/generator/shoulda_mixin.rb',
-    'lib/jeweler/generator/testspec_mixin.rb',
-    'lib/jeweler/generator/testunit_mixin.rb',
-    'lib/jeweler/generator/yard_mixin.rb',
-    'lib/jeweler/rubyforge_tasks.rb',
-    'lib/jeweler/rubygems_dot_org_tasks.rb',
-    'lib/jeweler/rubygems_tasks.rb',
-    'lib/jeweler/specification.rb',
-    'lib/jeweler/tasks.rb',
-    'lib/jeweler/templates/.document',
-    'lib/jeweler/templates/.gitignore',
-    'lib/jeweler/templates/Gemfile',
-    'lib/jeweler/templates/LICENSE.txt',
-    'lib/jeweler/templates/README.rdoc',
-    'lib/jeweler/templates/Rakefile',
-    'lib/jeweler/templates/bacon/flunking.rb',
-    'lib/jeweler/templates/bacon/helper.rb',
-    'lib/jeweler/templates/bundler_setup.erb',
-    'lib/jeweler/templates/features/default.feature',
-    'lib/jeweler/templates/features/support/env.rb',
-    'lib/jeweler/templates/jeweler_tasks.erb',
-    'lib/jeweler/templates/micronaut/flunking.rb',
-    'lib/jeweler/templates/micronaut/helper.rb',
-    'lib/jeweler/templates/minitest/flunking.rb',
-    'lib/jeweler/templates/minitest/helper.rb',
-    'lib/jeweler/templates/other_tasks.erb',
-    'lib/jeweler/templates/riot/flunking.rb',
-    'lib/jeweler/templates/riot/helper.rb',
-    'lib/jeweler/templates/rspec/.rspec',
-    'lib/jeweler/templates/rspec/flunking.rb',
-    'lib/jeweler/templates/rspec/helper.rb',
-    'lib/jeweler/templates/shindo/flunking.rb',
-    'lib/jeweler/templates/shindo/helper.rb',
-    'lib/jeweler/templates/shoulda/flunking.rb',
-    'lib/jeweler/templates/shoulda/helper.rb',
-    'lib/jeweler/templates/simplecov.erb',
-    'lib/jeweler/templates/testspec/flunking.rb',
-    'lib/jeweler/templates/testspec/helper.rb',
-    'lib/jeweler/templates/testunit/flunking.rb',
-    'lib/jeweler/templates/testunit/helper.rb',
-    'lib/jeweler/version.rb',
-    'lib/jeweler/version_helper.rb',
-    'test/fixtures/bar/VERSION.yml',
-    'test/fixtures/bar/bin/foo_the_ultimate_bin',
-    'test/fixtures/bar/hey_include_me_in_gemspec',
-    'test/fixtures/bar/lib/foo_the_ultimate_lib.rb',
-    'test/fixtures/existing-project-with-version-constant/.document',
-    'test/fixtures/existing-project-with-version-constant/.gitignore',
-    'test/fixtures/existing-project-with-version-constant/LICENSE.txt',
-    'test/fixtures/existing-project-with-version-constant/README.rdoc',
-    'test/fixtures/existing-project-with-version-constant/Rakefile',
-    'test/fixtures/existing-project-with-version-constant/existing-project-with-version.gemspec',
-    'test/fixtures/existing-project-with-version-constant/lib/existing_project_with_version.rb',
-    'test/fixtures/existing-project-with-version-constant/test/existing_project_with_version_test.rb',
-    'test/fixtures/existing-project-with-version-constant/test/test_helper.rb',
-    'test/fixtures/existing-project-with-version-plaintext/.document',
-    'test/fixtures/existing-project-with-version-plaintext/.gitignore',
-    'test/fixtures/existing-project-with-version-plaintext/LICENSE.txt',
-    'test/fixtures/existing-project-with-version-plaintext/README.rdoc',
-    'test/fixtures/existing-project-with-version-plaintext/Rakefile',
-    'test/fixtures/existing-project-with-version-plaintext/VERSION',
-    'test/fixtures/existing-project-with-version-plaintext/existing-project-with-version.gemspec',
-    'test/fixtures/existing-project-with-version-plaintext/lib/existing_project_with_version.rb',
-    'test/fixtures/existing-project-with-version-plaintext/test/existing_project_with_version_test.rb',
-    'test/fixtures/existing-project-with-version-plaintext/test/test_helper.rb',
-    'test/fixtures/existing-project-with-version-yaml/.document',
-    'test/fixtures/existing-project-with-version-yaml/.gitignore',
-    'test/fixtures/existing-project-with-version-yaml/LICENSE.txt',
-    'test/fixtures/existing-project-with-version-yaml/README.rdoc',
-    'test/fixtures/existing-project-with-version-yaml/Rakefile',
-    'test/fixtures/existing-project-with-version-yaml/VERSION.yml',
-    'test/fixtures/existing-project-with-version-yaml/bin/foo_the_ultimate_bin',
-    'test/fixtures/existing-project-with-version-yaml/existing-project-with-version.gemspec',
-    'test/fixtures/existing-project-with-version-yaml/lib/existing_project_with_version.rb',
-    'test/fixtures/existing-project-with-version-yaml/test/existing_project_with_version_test.rb',
-    'test/fixtures/existing-project-with-version-yaml/test/test_helper.rb',
-    'test/geminstaller.yml',
-    'test/jeweler/commands/test_build_gem.rb',
-    'test/jeweler/commands/test_install_gem.rb',
-    'test/jeweler/commands/test_release_to_gemcutter.rb',
-    'test/jeweler/commands/test_release_to_git.rb',
-    'test/jeweler/commands/test_release_to_github.rb',
-    'test/jeweler/commands/test_validate_gemspec.rb',
-    'test/jeweler/commands/test_write_gemspec.rb',
-    'test/jeweler/commands/version/test_base.rb',
-    'test/jeweler/commands/version/test_bump_major.rb',
-    'test/jeweler/commands/version/test_bump_minor.rb',
-    'test/jeweler/commands/version/test_bump_patch.rb',
-    'test/jeweler/commands/version/test_write.rb',
-    'test/jeweler/generator/test_application.rb',
-    'test/jeweler/generator/test_options.rb',
-    'test/jeweler/test_gemspec_helper.rb',
-    'test/jeweler/test_generator.rb',
-    'test/jeweler/test_generator_initialization.rb',
-    'test/jeweler/test_generator_mixins.rb',
-    'test/jeweler/test_specification.rb',
-    'test/jeweler/test_tasks.rb',
-    'test/jeweler/test_version_helper.rb',
-    'test/shoulda_macros/jeweler_macros.rb',
-    'test/test_helper.rb',
-    'test/test_jeweler.rb'
-  ]
-  s.homepage = 'http://github.com/technicalpickles/jeweler'
-  s.licenses = ['MIT']
-  s.require_paths = ['lib']
-  s.rubygems_version = '2.0.3'
-  s.summary = 'Opinionated tool for creating and managing RubyGem projects'
->>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
-
-  if s.respond_to? :specification_version
-    s.specification_version = 4
-
-<<<<<<< HEAD
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.10"])
-      s.add_runtime_dependency(%q<github_api>, [">= 0"])
-      s.add_runtime_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_runtime_dependency(%q<bundler>, [">= 1.0"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<semver>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.5"])
-      s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 1.1.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 1.2.5"])
-      s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
-      s.add_dependency(%q<github_api>, [">= 0"])
-      s.add_dependency(%q<highline>, [">= 1.6.15"])
-      s.add_dependency(%q<bundler>, [">= 1.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<semver>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0.8.5"])
-      s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 1.1.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 1.2.5"])
-    s.add_dependency(%q<nokogiri>, [">= 1.5.10"])
-    s.add_dependency(%q<github_api>, [">= 0"])
-    s.add_dependency(%q<highline>, [">= 1.6.15"])
-    s.add_dependency(%q<bundler>, [">= 1.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<semver>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0.8.5"])
-    s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 1.1.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-=======
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-      s.add_runtime_dependency('rake', ['>= 0'])
-      s.add_runtime_dependency('git', ['>= 1.2.5'])
-      s.add_runtime_dependency('nokogiri', ['>= 1.5.10'])
-      s.add_runtime_dependency('github_api', ['>= 0'])
-      s.add_runtime_dependency('highline', ['>= 1.6.15'])
-      s.add_runtime_dependency('bundler', ['>= 1.0'])
-      s.add_runtime_dependency('rdoc', ['>= 0'])
-      s.add_runtime_dependency('builder', ['>= 0'])
-      s.add_development_dependency('yard', ['>= 0.8.5'])
-      s.add_development_dependency('bluecloth', ['>= 0'])
-      s.add_development_dependency('cucumber', ['>= 1.1.4'])
-      s.add_development_dependency('simplecov', ['>= 0'])
-    else
-      s.add_dependency('rake', ['>= 0'])
-      s.add_dependency('git', ['>= 1.2.5'])
-      s.add_dependency('nokogiri', ['>= 1.5.10'])
-      s.add_dependency('github_api', ['>= 0'])
-      s.add_dependency('highline', ['>= 1.6.15'])
-      s.add_dependency('bundler', ['>= 1.0'])
-      s.add_dependency('rdoc', ['>= 0'])
-      s.add_dependency('builder', ['>= 0'])
-      s.add_dependency('yard', ['>= 0.8.5'])
-      s.add_dependency('bluecloth', ['>= 0'])
-      s.add_dependency('cucumber', ['>= 1.1.4'])
-      s.add_dependency('simplecov', ['>= 0'])
-    end
-  else
-    s.add_dependency('rake', ['>= 0'])
-    s.add_dependency('git', ['>= 1.2.5'])
-    s.add_dependency('nokogiri', ['>= 1.5.10'])
-    s.add_dependency('github_api', ['>= 0'])
-    s.add_dependency('highline', ['>= 1.6.15'])
-    s.add_dependency('bundler', ['>= 1.0'])
-    s.add_dependency('rdoc', ['>= 0'])
-    s.add_dependency('builder', ['>= 0'])
-    s.add_dependency('yard', ['>= 0.8.5'])
-    s.add_dependency('bluecloth', ['>= 0'])
-    s.add_dependency('cucumber', ['>= 1.1.4'])
-    s.add_dependency('simplecov', ['>= 0'])
->>>>>>> 1d6f8d13d012c584ad37b496c999edfb0127aadc
-  end
-end