new 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec30d1f324958d09da830e870c2fc6c30e179069
-  data.tar.gz: 73856394a3d25e9f0eefaffae3cb1594ae5602cd
+  metadata.gz: ac708e8f62fd995e12729e8ad37c663cbf5e8428
+  data.tar.gz: b3af8782b660ada2c9c96f7a27363a8bdaa4b30d
 SHA512:
-  metadata.gz: 2dd44b9ff608bb296ae4cd808f793b202506a28f7f3e5eb46d41188b43e71ff693ffa84256b4bafa8173827916743b4548ce7c7bdc81ac2915ebd92cdbefaac2
-  data.tar.gz: 97ed8494f502c06816810fd6a87084b8e9c4d92229e302d80fdf065f939dd7c89fe3be46b3d3980307952bdc2c7fbc0c222411e0409d2a94a9c35b66f496d409
+  metadata.gz: d47f8afb9bed21ae1be841aa271353adbc57ebb91d10bf3611d982c92a6f015f05588b2f58d58e414750256686388a9f33ed30645c88fc33c347ec984461074d
+  data.tar.gz: ee279d28962eb4e738a3fade8abc2cfb511744699fc78041f7a89825d72c96e3f990d8519b91e93fe2fa3bbf8b425d1c81e5e38bec6248b77f605f30df5ff1fb

data/.new

@@ -1,6 +1,5 @@
 ---
 license: MIT
-version: 0.0.11
 developer:
   name: Ryan Brewster
   email: brewster1134@gmail.com
@@ -16,5 +15,6 @@ tasks:
       bindir: bin
       test_files:
       - spec/**/*.rb
+version: 0.0.12
 project_name: new
 type: js

data/Guardfile

@@ -6,7 +6,7 @@ guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec doc spec tasks ~/.new/tasks' do
+guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec spec tasks ~/.new/tasks' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^tasks/.+_spec\.rb$})
   watch(%r{^tasks/(.+[^_spec])\.rb$}) { |m| "tasks/#{m[1]}_spec.rb" }

data/lib/new/cli.rb

@@ -34,19 +34,18 @@ class New::Cli < Thor
     if Dir.exists? New::CUSTOM_DIR
       New.say 'Home folder already exists.', type: :warn
     else
-      # create folder
+      # create folders
       New.say 'Creating home folder.', type: :success
-      FileUtils.mkdir_p New::CUSTOM_DIR
       FileUtils.mkdir_p File.join(New::CUSTOM_DIR, New::TASKS_DIR_NAME)
       FileUtils.mkdir_p File.join(New::CUSTOM_DIR, New::TEMPLATES_DIR_NAME)
 
       # create config file
       New.say 'Creating default configuration file.', type: :success
       File.open File.join(New::CUSTOM_DIR, New::CONFIG_FILE), 'w' do |f|
-        f.write New::Template::CUSTOM_CONFIG_TEMPLATE.to_yaml
+        f.write New::Template::CUSTOM_CONFIG_TEMPLATE.deep_stringify_keys.to_yaml
       end
 
-      New.say "Edit #{File.join(New::CUSTOM_DIR, New::CONFIG_FILE)} with your custom configuration details.", type: :warn
+      New.say "Edit `#{File.join(New::CUSTOM_DIR, New::CONFIG_FILE)}` with your custom configuration details.", type: :warn
     end
   end
 
@@ -73,6 +72,7 @@ class New::Cli < Thor
         New.say "No task '#{task}' found!", type: :fail
         next
       end
+      New.say ">>> Initializing #{task.to_s.humanize} Task...", type: :warn
       "New::Task::#{task.to_s.classify}".constantize.new project_config
     end
   end

data/lib/new/version.rb

@@ -1,10 +1,35 @@
 module New::Version
   require 'semantic'
 
+  def part; @part; end
+  def previous_version; @previous_version; end
   def version; @version; end
 
+  def bump_version previous_version, part = nil
+    @previous_version = get_version previous_version
+    @part = part ||= get_part
+
+    # bump version
+    case part
+    when :major
+      @previous_version.major += 1
+      @previous_version.minor = 0
+      @previous_version.patch = 0
+    when :minor
+      @previous_version.minor += 1
+      @previous_version.patch = 0
+    when :patch
+      @previous_version.patch += 1
+    end
+
+    # set new version
+    @version = @previous_version
+  end
+
+private
+
   def get_part
-    New.say "            Current Version: #{version}", type: :success
+    New.say "            Current Version: #{previous_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!
 
@@ -18,31 +43,11 @@ module New::Version
     end
   end
 
-  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
-
-    version
-  end
-
-private
-
-  def get_version string
-    @version ||= begin
-      Semantic::Version.new string
+  def get_version version
+    begin
+      Semantic::Version.new version.to_s
     rescue
-      New.say "#{string} is not a semantic version.  Use format `1.2.3`", type: :fail
+      New.say "#{version} is not a semantic version.  Use format `1.2.3`", type: :fail
       exit
     end
   end

data/spec/lib/new/cli_spec.rb

@@ -40,7 +40,10 @@ describe New::Cli do
     end
 
     it 'should create .new file' do
-      expect(File.exists?(root('.tmp', '.new', '.new'))).to be_true
+      expect(File.exists?(root('.tmp', '.new', New::CONFIG_FILE))).to be_true
+
+      # Check that the keys are properly formatted in the yaml file
+      expect(File.read(root('.tmp', '.new', New::CONFIG_FILE))).to match /^version: 0.0.0$/
     end
 
     it 'should create an empty templates & tasks dir' do

data/spec/lib/new/version_spec.rb

@@ -9,15 +9,18 @@ describe New::Version do
 
   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'
+      version.bump_version('1.2.3', :major)
+      expect(version.version.to_s).to eq '2.0.0'
     end
 
     it 'should bump the minor version' do
-      expect(version.bump_version('1.2.3', :minor).to_s).to eq '1.3.0'
+      version.bump_version('1.2.3', :minor)
+      expect(version.version.to_s).to eq '1.3.0'
     end
 
     it 'should bump the patch version' do
-      expect(version.bump_version('1.2.3', :patch).to_s).to eq '1.2.4'
+      version.bump_version('1.2.3', :patch)
+      expect(version.version.to_s).to eq '1.2.4'
     end
   end
 end

data/tasks/gem/gem.rb

@@ -24,16 +24,18 @@ class New::Task::Gem < New::Task
     write_gemspec
     write_config
     deploy
+
+    New.say "Version #{project_options[:version].green} of the #{project_options[:project_name].green} gem successfully published."
   end
 
 private
 
   def set_version
     # bump version
-    version = bump_version(project_options[:version], get_part).to_s
+    bump_version project_options[:version]
 
     # set new version to config
-    project_options[:version] = version
+    project_options[:version] = version.to_s
   end
 
   # Check that any glob pattern attributes match existing files
@@ -130,6 +132,8 @@ private
   end
 
   def write_gemspec
+    New.say 'Updating `.gemspec` file...', type: :success
+
     # process gemspec
     interpolate File.join(File.dirname(__FILE__), '.gemspec.erb'), project_options
 
@@ -141,6 +145,8 @@ private
   end
 
   def write_config
+    New.say 'Updating `.new` file...', type: :success
+
     writeable_options = project_options.dup
     writeable_options.delete(:gemspec_string)
     GLOB_ATTRIBUTES.each{ |a| writeable_options.delete(a) }
@@ -151,6 +157,9 @@ private
   end
 
   def deploy
+    New.say 'Pushing new gem version to rubygems...', type: :success
+    New.say '                ...This may take a bit', type: :warn
+
     `gem update --system`
     `gem build .gemspec`
     `gem push #{@gemspec[:name]}-#{@gemspec[:version]}.gem`

data/tasks/gem/gem_spec.rb

@@ -91,7 +91,7 @@ describe New::Task::Gem do
     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'"
+      expect(gem_dependencies).to include "  s.add_development_dependency 'bar', '>= 0'"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport