RubyGems - new - Versions diffs - 0.0.6 → 0.0.7 - Mend

new 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

checksums.yaml +4 -4
data/.gitmodules +3 -0
data/.new +1 -1
data/Gemfile.lock +25 -20
data/Guardfile +6 -4
data/README.md +9 -2
data/doc/.git +1 -0
data/doc/Gemfile.html +125 -0
data/doc/Gemfile_lock.html +198 -0
data/doc/Guardfile.html +134 -0
data/doc/InterpolateSpec.html +116 -0
data/doc/LICENSE_txt.html +132 -0
data/doc/New/Cli.html +290 -0
data/doc/New/Dsl.html +185 -0
data/doc/New/Interpolate.html +238 -0
data/doc/New/Project.html +171 -0
data/doc/New/Task/CustomBarTask.html +154 -0
data/doc/New/Task/FooTask.html +168 -0
data/doc/New/Task/Gem.html +197 -0
data/doc/New/Task/TaskSpec.html +168 -0
data/doc/New/Task.html +380 -0
data/doc/New/Template.html +234 -0
data/doc/New/Version.html +277 -0
data/doc/New.html +377 -0
data/doc/Object.html +200 -0
data/doc/README_md.html +292 -0
data/doc/VersionSpec.html +116 -0
data/doc/created.rid +47 -0
data/doc/fonts/Lato-Light.ttf +0 -0
data/doc/fonts/Lato-LightItalic.ttf +0 -0
data/doc/fonts/Lato-Regular.ttf +0 -0
data/doc/fonts/Lato-RegularItalic.ttf +0 -0
data/doc/fonts/SourceCodePro-Bold.ttf +0 -0
data/doc/fonts/SourceCodePro-Regular.ttf +0 -0
data/doc/fonts.css +167 -0
data/doc/images/add.png +0 -0
data/doc/images/arrow_up.png +0 -0
data/doc/images/brick.png +0 -0
data/doc/images/brick_link.png +0 -0
data/doc/images/bug.png +0 -0
data/doc/images/bullet_black.png +0 -0
data/doc/images/bullet_toggle_minus.png +0 -0
data/doc/images/bullet_toggle_plus.png +0 -0
data/doc/images/date.png +0 -0
data/doc/images/delete.png +0 -0
data/doc/images/find.png +0 -0
data/doc/images/loadingAnimation.gif +0 -0
data/doc/images/macFFBgHack.png +0 -0
data/doc/images/package.png +0 -0
data/doc/images/page_green.png +0 -0
data/doc/images/page_white_text.png +0 -0
data/doc/images/page_white_width.png +0 -0
data/doc/images/plugin.png +0 -0
data/doc/images/ruby.png +0 -0
data/doc/images/tag_blue.png +0 -0
data/doc/images/tag_green.png +0 -0
data/doc/images/transparent.png +0 -0
data/doc/images/wrench.png +0 -0
data/doc/images/wrench_orange.png +0 -0
data/doc/images/zoom.png +0 -0
data/doc/index.html +142 -0
data/doc/js/darkfish.js +140 -0
data/doc/js/jquery.js +18 -0
data/doc/js/navigation.js +142 -0
data/doc/js/search.js +109 -0
data/doc/js/search_index.js +1 -0
data/doc/js/searcher.js +228 -0
data/doc/rdoc.css +580 -0
data/doc/spec/fixtures/custom/templates/custom_bar_template/custom_bar_txt.html +110 -0
data/doc/table_of_contents.html +324 -0
data/doc/tasks/gem/README_md.html +150 -0
data/doc/templates/js/Gemfile.html +147 -0
data/doc/templates/js/Guardfile.html +117 -0
data/doc/templates/js/lib/README_md.html +114 -0
data/doc/templates/js/spec/spec_helper_js_coffee.html +110 -0
data/doc/templates/js/spec/vendor/chai_js.html +3864 -0
data/doc/templates/js/spec/vendor/sinon-chai_js.html +222 -0
data/doc/templates/js/spec/vendor/sinon_js.html +4358 -0
data/doc/templates/js/src/README_md.html +125 -0
data/lib/new/task.rb +2 -4
data/lib/new/template.rb +1 -1
data/lib/new/version.rb +27 -19
data/spec/fixtures/tasks/foo_task/Gemfile +5 -0
data/spec/lib/new/version_spec.rb +10 -15
data/spec/spec_helper.rb +22 -1
data/tasks/gem/gem.rb +44 -8
data/tasks/gem/gem_spec.rb +139 -0
metadata +233 -3

data/doc/templates/js/src/README_md.html ADDED Viewed

@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>README - RDoc Documentation</title>
+<link href="../../../fonts.css" rel="stylesheet">
+<link href="../../../rdoc.css" rel="stylesheet">
+<script type="text/javascript">
+  var rdoc_rel_prefix = "../../../";
+</script>
+<script src="../../../js/jquery.js"></script>
+<script src="../../../js/navigation.js"></script>
+<script src="../../../js/search_index.js"></script>
+<script src="../../../js/search.js"></script>
+<script src="../../../js/searcher.js"></script>
+<script src="../../../js/darkfish.js"></script>
+<body id="top" role="document" class="file">
+<nav role="navigation">
+  <div id="project-navigation">
+    <div id="home-section" role="region" title="Quick navigation" class="nav-section">
+  <h2>
+    <a href="../../../index.html" rel="home">Home</a>
+  </h2>
+  <div id="table-of-contents-navigation">
+    <a href="../../../table_of_contents.html#pages">Pages</a>
+    <a href="../../../table_of_contents.html#classes">Classes</a>
+    <a href="../../../table_of_contents.html#methods">Methods</a>
+  </div>
+</div>
+    <div id="search-section" role="search" class="project-section initially-hidden">
+  <form action="#" method="get" accept-charset="utf-8">
+    <div id="search-field-wrapper">
+      <input id="search-field" role="combobox" aria-label="Search"
+             aria-autocomplete="list" aria-controls="search-results"
+             type="text" name="search" placeholder="Search" spellcheck="false"
+             title="Type to search, Up and Down to navigate, Enter to load">
+    </div>
+    <ul id="search-results" aria-label="Search Results"
+        aria-busy="false" aria-expanded="false"
+        aria-atomic="false" class="initially-hidden"></ul>
+  </form>
+</div>
+  </div>
+<div class="nav-section">
+  <h3>Table of Contents</h3>
+  <ul class="link-list" role="directory">
+    <li><a href="#label-CHANGE+LOG">CHANGE LOG</a>
+    <li><a href="#label-0.0.1">0.0.1</a>
+  </ul>
+</div>
+  <div id="project-metadata">
+    <div id="fileindex-section" class="nav-section">
+  <h3>Pages</h3>
+  <ul class="link-list">
+    <li><a href="../../../Gemfile.html">Gemfile</a>
+    <li><a href="../../../Gemfile_lock.html">Gemfile.lock</a>
+    <li><a href="../../../Guardfile.html">Guardfile</a>
+    <li><a href="../../../LICENSE_txt.html">LICENSE</a>
+    <li><a href="../../../README_md.html">README</a>
+    <li><a href="../../../spec/fixtures/custom/templates/custom_bar_template/custom_bar_txt.html">custom_bar</a>
+    <li><a href="../../../tasks/gem/README_md.html">README</a>
+    <li><a href="../../../templates/js/Gemfile.html">Gemfile</a>
+    <li><a href="../../../templates/js/Guardfile.html">Guardfile</a>
+    <li><a href="../../../templates/js/lib/README_md.html">README</a>
+    <li><a href="../../../templates/js/spec/spec_helper_js_coffee.html">spec_helper.js.coffee</a>
+    <li><a href="../../../templates/js/spec/vendor/chai_js.html">chai.js</a>
+    <li><a href="../../../templates/js/spec/vendor/sinon-chai_js.html">sinon-chai.js</a>
+    <li><a href="../../../templates/js/spec/vendor/sinon_js.html">sinon.js</a>
+    <li><a href="../../../templates/js/src/README_md.html">README</a>
+  </ul>
+</div>
+  </div>
+</nav>
+<main role="main" aria-label="Page templates/js/src/README.md">
+<h4 id="label-CHANGE+LOG">CHANGE LOG<span><a href="#label-CHANGE+LOG">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
+<h6 id="label-0.0.1">0.0.1<span><a href="#label-0.0.1">&para;</a> <a href="#documentation">&uarr;</a></span></h6>
+<p>*</p>
+</main>
+<footer id="validator-badges" role="contentinfo">
+  <p><a href="http://validator.w3.org/check/referer">Validate</a>
+  <p>Generated by <a href="http://rdoc.rubyforge.org">RDoc</a> 4.1.0.
+  <p>Based on <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
+</footer>

data/lib/new/task.rb CHANGED Viewed

@@ -20,13 +20,11 @@ class New::Task
   #
   def project_options
     custom_options = New.custom_config
-    project_options = @project_config
-    all_options = custom_options.deep_merge(project_options)
+    all_options = custom_options.deep_merge(@project_config)
     # Groom tasks (prevent tasks from the custom config from polluting the project config)
     all_options[:tasks].each_key do |task|
-      all_options[:tasks].delete(task) unless project_options[:tasks].has_key?(task)
+      all_options[:tasks].delete(task) unless @project_config[:tasks].has_key?(task)
     end
     @project_options ||= all_options

data/lib/new/template.rb CHANGED Viewed

@@ -7,7 +7,7 @@ class New::Template
   #
   CUSTOM_CONFIG_TEMPLATE = {
     license: '[LICENSE]',
-    version: '[VERSION]',
+    version: '0.0.0',
     developer: {
       name: '[NAME]',
       email: '[EMAIL]'

data/lib/new/version.rb CHANGED Viewed

@@ -1,22 +1,34 @@
 module New::Version
   require 'semantic'
-  def version= string
-    @version ||= begin
-      Semantic::Version.new string
-    rescue
-      New.say "#{string} is not a semantic version.  Use format `1.2.3`", type: :fail
-      exit
+  def version; @version; end
+  def get_part
+    New.say "            Current Version: #{version}", type: :success
+    New.say " Specify which part to bump: [#{'Mmp'.green}] (#{'M'.green}ajor / #{'m'.green}inor / #{'p'.green}atch)"
+    part = STDIN.gets.chomp!
+    case part
+    when 'M'
+      :major
+    when 'm'
+      :minor
+    when 'p'
+      :patch
     end
   end
-  def version; @version; end
-  def bump_version part
+  def bump_version current_version, part
+    get_version current_version
     case part
     when :major
       version.major += 1
+      version.minor = 0
+      version.patch = 0
     when :minor
       version.minor += 1
+      version.patch = 0
     when :patch
       version.patch += 1
     end
@@ -24,18 +36,14 @@ module New::Version
     version
   end
-  def get_part
-    New.say "            Current Version: #{version}", type: :success
-    New.say " Specify which part to bump: [#{'Mmp'.green}] (#{'M'.green}ajor / #{'m'.green}inor / #{'p'.green}atch)"
-    part = STDIN.gets.chomp!
+private
-    case part
-    when 'M'
-      :major
-    when 'm'
-      :minor
-    when 'p'
-      :patch
+  def get_version string
+    @version ||= begin
+      Semantic::Version.new string
+    rescue
+      New.say "#{string} is not a semantic version.  Use format `1.2.3`", type: :fail
+      exit
     end
   end
 end

data/spec/fixtures/tasks/foo_task/Gemfile ADDED Viewed

@@ -0,0 +1,5 @@
+gem 'foo', '~> 1.2.3'
+group :development do
+  gem 'bar'
+end

data/spec/lib/new/version_spec.rb CHANGED Viewed

@@ -7,22 +7,17 @@ end
 describe New::Version do
   let(:version){ VersionSpec.new }
-  before do
-    version.version = '1.2.3'
-  end
-  it 'should set a version' do
-    expect(version.version.to_s).to eq '1.2.3'
-  end
-  it 'should bump the version' do
-    version.bump_version :major
-    expect(version.version.to_s).to eq '2.2.3'
+  describe '#bump_version' do
+    it 'should bump the major version' do
+      expect(version.bump_version('1.2.3', :major).to_s).to eq '2.0.0'
+    end
-    version.bump_version :minor
-    expect(version.version.to_s).to eq '2.3.3'
+    it 'should bump the minor version' do
+      expect(version.bump_version('1.2.3', :minor).to_s).to eq '1.3.0'
+    end
-    version.bump_version :patch
-    expect(version.version.to_s).to eq '2.3.4'
+    it 'should bump the patch version' do
+      expect(version.bump_version('1.2.3', :patch).to_s).to eq '1.2.4'
+    end
   end
 end

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 $: << File.expand_path('../../lib', __FILE__)
-$: << File.expand_path('../fixtures', __FILE__)
 require 'new'
+$: << File.expand_path('../../tasks', __FILE__)
+$: << File.expand_path('../fixtures', __FILE__)
+$: << File.expand_path('tasks', New::CUSTOM_DIR)
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -24,3 +26,22 @@ end
 def root *paths
   paths.unshift(File.expand_path('../../', __FILE__)).compact.join '/'
 end
+def require_task task
+  require "#{task}/#{task}"
+end
+def new_task task, options = {}
+  task_class = "New::Task::#{task.to_s.classify}".constantize
+  task_class.any_instance.stub(:get_part).and_return(:patch)
+  task_class.any_instance.stub(:run)
+  task_hash = {}
+  task_hash[task] = {}
+  task_options = {
+    tasks: task_hash
+  }.merge(options)
+  task_class.new task_options
+end

data/tasks/gem/gem.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require 'bundler'
 require 'rake'
 require 'yaml'
@@ -6,6 +7,7 @@ class New::Task::Gem < New::Task
   include New::Version
   GLOB_ATTRIBUTES = [:files, :test_files, :extra_rdoc_files]
+  GEMFILE = File.expand_path(File.join(Dir.pwd, 'Gemfile'))
   OPTIONS = {
     gemspec: {
       summary: "A short summary of this gem's description. Displayed in `gem list -d`",
@@ -27,16 +29,15 @@ class New::Task::Gem < New::Task
 private
   def set_version
-    # set version
-    self.version = project_options[:version]
     # bump version
-    bump_version get_part
+    version = bump_version(project_options[:version], get_part).to_s
     # set new version to config
-    project_options[:version] = version.to_s
+    project_options[:version] = version
   end
+  # Check that any glob pattern attributes match existing files
+  #
   def validate_files
     GLOB_ATTRIBUTES.each do |file_attr|
       next if @gemspec[file_attr].nil?
@@ -60,7 +61,7 @@ private
   end
   def render_gemspec_options
-    string = []
+    array = []
     # set defaults
     @gemspec[:date]    = Date.today.to_s
@@ -86,10 +87,45 @@ private
       else v
       end
-      string << "  s.#{k} = #{val}"
+      array << "  s.#{k} = #{val}"
+    end
+    array += extract_gem_dependencies
+    project_options[:gemspec_string] = array.join("\n")
+  end
+  # Extract dependencies based on the Gemfile to be used in the gemspec
+  #
+  def extract_gem_dependencies
+    b = Bundler::Dsl.new
+    b.eval_gemfile(GEMFILE)
+    array = []
+    runtime = []
+    development = []
+    # loop through the required gems and find default and development gems
+    b.dependencies.each do |g|
+      groups = g.groups
+      data = {
+        name: g.name,
+        requirements: g.requirements_list.map{ |r| "'#{r}'" }.join(',')
+      }
+      runtime <<  data if groups.include? :default
+      development <<  data if groups.include? :development
+    end
+    # create .gemspec friendly string of requirements
+    runtime.each do |r|
+      array << "  s.add_runtime_dependency '#{r[:name]}', #{r[:requirements]}"
+    end
+    development.each do |r|
+      array << "  s.add_development_dependency '#{r[:name]}', #{r[:requirements]}"
     end
-    project_options[:gemspec_string] = string.join("\n")
+    return array
   end
   def write_gemspec

data/tasks/gem/gem_spec.rb ADDED Viewed

@@ -0,0 +1,139 @@
+require 'spec_helper'
+require_task :gem
+describe New::Task::Gem do
+  before do
+    stub_const 'New::CONFIG_FILE', New::CONFIG_FILE
+    stub_const 'New::Task::Gem::GLOB_ATTRIBUTES', [:foo_files]
+    @gem = new_task :gem, { version: '1.2.3' }
+    @pwd = Dir.pwd
+    @tmp_dir = Dir.mktmpdir
+    Dir.chdir @tmp_dir
+  end
+  after do
+    New::Task::Gem.any_instance.unstub(:run)
+    Dir.chdir @pwd
+  end
+  describe '#set_version' do
+    before do
+      @gem.send(:set_version)
+    end
+    it 'should set the version for project options' do
+      expect(@gem.project_options[:version]).to eq '1.2.4'
+    end
+  end
+  describe '#validate_files' do
+    before do
+      # temporarily change the current directory to the gem task folder to test for valid files
+      Dir.chdir File.dirname(__FILE__)
+      @gem.instance_variable_set(:@gemspec, { foo_files: ['*.rb', '*.md'] })
+      @gem.send(:validate_files)
+    end
+    after do
+      # go back to the original root dir
+      Dir.chdir @tmp_dir
+    end
+    it 'should replace the file_attr array of globs with an array of files' do
+      files = @gem.instance_variable_get(:@gemspec)[:foo_files]
+      expect(files.all?{ |f| files.include? f }).to be_true
+    end
+  end
+  describe '#render_gemspec_options' do
+    before do
+      @gem.stub(:extract_gem_dependencies).and_return(['s.extract_gem_dependencies'])
+      @gem.instance_variable_set(:@gemspec, {})
+      @gem.send(:render_gemspec_options)
+    end
+    after do
+      @gem.unstub(:extract_gem_dependencies)
+    end
+    it 'should create the gemspec_string option' do
+      gemspec_string = @gem.project_options[:gemspec_string]
+      expect(gemspec_string).to include "s.author = 'Foo Bar'"
+      expect(gemspec_string).to include "s.license = 'MIT'"
+      expect(gemspec_string).to include "s.extract_gem_dependencies"
+    end
+    context 'when plurals are set' do
+      before do
+        @gem.instance_variable_set(:@gemspec, {
+          authors: ['Foo Author'],
+          licenses: ['Foo License'],
+        })
+        @gem.send(:render_gemspec_options)
+      end
+      it 'should replace the singulars' do
+        expect(@gem.project_options[:gemspec_string]).to include 's.authors = ["Foo Author"]'
+        expect(@gem.project_options[:gemspec_string]).to_not include 's.author = '
+        expect(@gem.project_options[:gemspec_string]).to include 's.licenses = ["Foo License"]'
+        expect(@gem.project_options[:gemspec_string]).to_not include 's.license = '
+      end
+    end
+  end
+  describe '#extract_gem_dependencies' do
+    before do
+      stub_const 'New::Task::Gem::GEMFILE', root('spec', 'fixtures', 'tasks', 'foo_task', 'Gemfile')
+    end
+    it 'should set dependencies' do
+      gem_dependencies = @gem.send(:extract_gem_dependencies)
+      expect(gem_dependencies).to include "  s.add_runtime_dependency 'foo', '~> 1.2.3'"
+      expect(gem_dependencies).to include "  s.add_development_dependency 'bar', '>= 0'"
+    end
+  end
+  describe '#write_gemspec' do
+    before do
+      @gem.stub(:project_options).and_return({ gemspec_string: 'foo' })
+      @gem.send(:write_gemspec)
+    end
+    after do
+      @gem.unstub(:project_options)
+    end
+    it 'should write a gemspec file' do
+      expect(File.exist?('.gemspec')).to be_true
+    end
+    it 'should be a valid gemspec file' do
+      gemspec = File.read('.gemspec')
+      expect(gemspec).to include 'Gem::Specification.new'
+      expect(gemspec).to include 'foo'
+    end
+  end
+  describe '#write_config' do
+    before do
+      @gem.stub(:project_options).and_return({
+        gemspec_string: 'foo',
+        foo_files: 'foo',
+        bar: 'bar'
+      })
+      @gem.send(:write_config)
+    end
+    after do
+      @gem.unstub(:project_options)
+    end
+    it 'should update the config file' do
+      config = File.read(New::CONFIG_FILE)
+      expect(config).to_not include 'foo'
+      expect(config).to include 'bar: bar'
+    end
+  end
+end