tumbler 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.0.2
+
+
+
+== 0.0.1
+
+* added current directory to load path (Joshua Hull, 45c5db5)
+
 == 0.0.1
 
 * rollback version (Joshua Hull, 5c14fd9)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/tumbler/rake_tasks.rb

@@ -1,9 +1,9 @@
 class Tumbler
-  class Raketasks
+  class RakeTasks
 
     def self.register(base, name)
       if manager = Tumbler.load(base)
-        tasks = Raketasks.new(manager)
+        tasks = RakeTasks.new(manager)
         tasks.activate_project_tasks(name)
       else
         raise "This is not properly configured for tumbler probably due to a lack of a Tumbler configuration file."
@@ -33,18 +33,7 @@ class Tumbler
           end
         end
 
-        namespace :git do
-          task :check_clean do
-            @manager.clean? or raise("There are files that need to be committed first.")
-          end
-
-          task :check_uptodate do
-            @manager.update or raise("Unable to update first.")
-          end
-        end
-
         namespace :version do
-        
           desc "Tag current version into git"
           task :tag do
             @manager.tag
@@ -62,9 +51,19 @@ class Tumbler
                 @manager.bump_and_commit(field)
               end
 
+              task :push do
+                @manager.tag_and_push(field)
+              end
+
+              desc "Bump version from #{@manager.version.to_s} ->  #{@manager.version.value.bump(field).to_s} and push"
+              task :release do
+                @manager.bump_and_push(field)
+              end
+
               desc "Bump version from #{@manager.version.to_s} ->  #{@manager.version.value.bump(field).to_s} and push"
               task :release do
                 @manager.bump_and_push(field)
+                @manager.gem.push
               end
             end
           end

data/lib/tumbler.rb

@@ -3,6 +3,7 @@ require 'versionomy'
 require 'bundler'
 
 Callsite.activate_kernel_dir_methods
+
 $LOAD_PATH << __DIR__
 
 require 'tumbler/runner'
@@ -31,7 +32,7 @@ class Tumbler
 
   def self.use_rake_tasks(name = nil)
     root = File.dirname(Callsite.parse(caller).find{|c| c.filename =~ /Rakefile/}.filename)
-    Tumbler::Raketasks.register(File.expand_path(root), name)
+    Tumbler::RakeTasks.register(File.expand_path(root), name)
   end
 
   def self.load(base)

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ $LOAD_PATH << File.join(File.basename(__FILE__), '..', 'lib')
 
 require 'tumbler'
 
-def create_app(name, opts = {})
+def create_app(name = 'test', opts = {})
   temp_dir(name) do |dir|
     temp_dir("remote-#{name}.git") do |remote_dir|
       Tumbler::Generate.app(dir, name, opts).write

data/spec/tasks_spec.rb

@@ -0,0 +1,80 @@
+require 'spec/spec_helper'
+
+describe Tumbler do
+  before(:all) do
+    ENV['RUBYLIB'] = File.expand_path(File.join(__DIR__, '..', 'lib'))
+  end
+
+  #before(:each) do
+  #  dir = File.expand_path(File.join(__DIR__, 'tmp'))
+  #  FileUtils.mkdir_p(dir)
+  #  @dir, @app = create_bare_app('test', :dir => dir)
+  #end
+  #
+  #after(:each) do
+  #  FileUtils.rm_rf(@dir)
+  #  $".delete "tumbler/gemspec.rb" # we need to delete this so each gemspec can be generated fresh
+  #end
+
+  it "should gem.build" do
+    create_app do |app|
+      app.gem.build
+      File.exist?("#{app.base}/test-0.0.0.gem").should be_true
+    end
+  end
+
+  context "version bumping" do
+    it "shouldn't write a new tag" do
+      create_app do |app|
+        app.bump_and_commit(:minor)
+        app.tags.should == ['0.0.0']
+      end
+    end
+  
+    it "should increment the locally stored version" do
+      create_app do |app|
+        app.bump_and_commit(:minor)
+        app.reload
+        app.version.to_s.should == '0.1.0'
+      end
+    end
+  
+    it "should successfully push after a bump" do
+      create_app do |app|
+        app.bump_and_commit(:minor)
+        app.tag_and_push
+        app.reload
+        app.version.to_s.should == '0.1.0'
+        app.tags.should == %w(0.0.0 0.1.0)
+      end
+    end
+  end
+  
+  context "version bumping & pushing" do
+    it "should create a nice changelog" do
+      create_app do |app|
+        app.sh 'touch test1; git add test1; git commit test1 -m"Added test1"'
+        app.bump_and_push(:minor)
+        app.sh 'touch test2; git add test2; git commit test2 -m"Added test2"'
+        app.sh 'touch test2-1; git add test2-1; git commit test2-1 -m"Added test2-1"'
+        app.bump_and_push(:minor)
+        app.sh 'touch test3; git add test3; git commit test3 -m"Added test3"'
+        app.bump_and_push(:minor)
+        app.sh 'touch test4; git add test4; git commit test4 -m"Added test4"'
+        app.bump_and_push(:minor)
+        app.reload
+        changelog = File.read(app.changelog.file)
+        changelog.should match(/== 0\.4\.0\s+\* Added test4 \(.*?\)\n\n==/)
+        changelog.should match(/== 0\.3\.0\s+\* Added test3 \(.*?\)\n\n==/)
+        changelog.should match(/== 0\.2\.0\s+\* Added test2-1 \(.*?\)\n\* Added test2 \(.*?\)\n\n==/)
+        changelog.should match(/== 0\.1\.0\s+\* Added test1 \(.*?\)\n\n$/)
+      end
+    end
+  end
+  
+  #
+  #  @app.bump_and_commit(:minor)
+  #  @app.tag_and_push
+  #end
+
+end

data/thinking2.txt

@@ -0,0 +1,72 @@
+You left the chat by being disconnected from the server.
+[4:53pm] You were promoted to operator by ChanServ.
+[4:53pm] You rejoined the room.
+[4:53pm] nesquena: the issue is that when using :git => "xxx" in gemfile, bundler is relying on the dynamic gemspec directly
+[4:53pm] nesquena: but its not clear to me why this causes everything to break hard
+[4:54pm] You left the chat by being disconnected from the server.
+[4:54pm] calvino.freenode.net: [freenode-info] channel flooding and no channel staff around to help? Please check with freenode support: http://freenode.net/faq.shtml#gettinghelp
+[4:54pm] You rejoined the room.
+[4:54pm] You were promoted to operator by ChanServ.
+[4:55pm] nesquena: joshbuddy: i noticed tumbler relies on a VERSION file similar to jeweler. for some reason i have heard multiple people recommend using a version.rb file with a GemName::Version syntax instead. have you ever heard that before?
+[4:55pm] nesquena: heres where padrino moved from VERSION to a version.rb: http://github.com/padrino/padrino-framework/issuesearch?state=closed&q=version#issue/88
+[4:55pm] nesquena: and where sinatra did: http://github.com/sinatra/sinatra/commit/e1638a43ad3a5c5ea70db56944a5230cc86e537a
+[4:55pm] achiu joined the chat room.
+[4:55pm] achiu was promoted to operator by ChanServ.
+[4:55pm] joshbuddy: nesquena: oh, well, i'll just follow that then
+[4:55pm] joshbuddy: should be easy to change
+[4:56pm] nesquena: joshbuddy: yea seems like it has partially to do with rip only taking the lib folder
+[4:56pm] joshbuddy: not sure why its best practice though
+[4:56pm] nesquena: joshbuddy: so any attempt to read version fails miserably
+[4:56pm] joshbuddy: oh, i suppose thats valid
+[4:56pm] joshbuddy: i'll fix that, thanks!
+[4:56pm] nesquena: joshbuddy: sure, they sort of discuss it in the comments here: http://github.com/sinatra/sinatra/commit/e1638a43ad3a5c5ea70db56944a5230cc86e537a
+[4:56pm] nesquena: joshbuddy: isnt a big deal but thot id let you know since id like padrino to use tumbler too!
+[4:57pm] joshbuddy: well, i'd like to follow the current state of the art
+[4:57pm] nesquena: joshbuddy: yea i figured as much. tumbler is looking awesome
+[4:58pm] joshbuddy: thanks! just wanna finish it already!
+[4:58pm] nesquena: joshbuddy: and i would love to put it into padrino for 0.9.12
+[4:58pm] joshbuddy: uup
+[4:58pm] joshbuddy: thats the goal
+[4:58pm] joshbuddy: and raise everyone's boats
+[4:59pm] nesquena: joshbuddy: yea i can easily see it taking over for jeweler once the kinks are worked out
+[4:59pm] joshbuddy: yeah, exactly.
+[4:59pm] joshbuddy: but i don't want to release until it does what it minimially promises
+[4:59pm] nesquena: joshbuddy: we should definately put it on rubyflow, im even down to write a padrino blog post about it or you are welcome to also
+[4:59pm] nesquena: joshbuddy: yea definately
+[4:59pm] joshbuddy: and the key there, is really really good testing
+[4:59pm] joshbuddy: yup
+[5:01pm] nesquena: joshbuddy: in padrino the way we update version is just to gsub it into the version.rb file:
+[5:01pm] nesquena: version_text = File.read(version_path).sub(/VERSION = '[\d\.]+'/, "VERSION = '#{args.version}'")
+[5:01pm] nesquena: not sure its the best but it gets the job done
+[5:01pm] joshbuddy: i'll do something like it for now ..
+[5:02pm] nesquena: joshbuddy: yea you can even keep the sytax
+[5:03pm] nesquena: use_version do
+[5:03pm] nesquena:     filename 'padrino-core/lib/version.rb'
+[5:03pm] nesquena:   end
+[5:03pm] joshbuddy: thats exactly what i'm thinkin' 
+[5:03pm] RichGuk: Man you guys talk to quick.
+[5:03pm] RichGuk: *reads up*
+[5:03pm] nesquena: joshbuddy: although im not sure thats better than version_file 'padrino-core/lib/version.rb'
+[5:03pm] nesquena: more dsl declarative
+[5:04pm] joshbuddy: well, i suspect there are other version options ..
+[5:04pm] joshbuddy: in fact, there are ..
+[5:04pm] joshbuddy: its not documented yet, but you can have fields in there..
+[5:04pm] joshbuddy: to indicate which version fields you want to be able to act one
+[5:04pm] joshbuddy: on
+[5:06pm] nesquena: joshbuddy: what do you mean which to act on? like major, tiny, minor?
+[5:06pm] nesquena: what about something like: joshbuddy: i was
+[5:06pm] nesquena: http://gist.github.com/441270
+[5:06pm] joshbuddy: nesquena: exactly
+[5:06pm] nesquena: joshbuddy: ok not a big deal, works either way
+[5:06pm] joshbuddy: oh, thats nicer!
+[5:06pm] joshbuddy: but _file ..
+[5:07pm] joshbuddy: seems odd ..
+[5:07pm] nesquena: joshbuddy: yea because i think in the 80% case it will be much cleaner
+[5:07pm] joshbuddy: when changelog doesn't get it too
+[5:07pm] nesquena: joshbuddy: ok just version then
+[5:07pm] joshbuddy: nono, i'm thinking changelog_file
+[5:07pm] joshbuddy:
+[5:07pm] nesquena: http://gist.github.com/441270
+[5:07pm] nesquena: oh
+[5:07pm] nesquena: haha
+[5:07pm] nesquena: yea that makes sense. i think that looks pretty clean

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -151,13 +151,17 @@ files:
 - spec/generate_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/tasks_spec.rb
 - spec/updater_spec.rb
 - spec/version_spec.rb
 - template/Gemfile
 - template/Rakefile
 - template/generic.Tumbler.erb
 - template/generic.gemspec.erb
+- test1
 - thinking.txt
+- thinking2.txt
+- tumbler-0.0.1.gem
 - tumbler.gemspec
 has_rdoc: true
 homepage: http://github.com/joshbuddy/tumbler
@@ -200,5 +204,6 @@ test_files:
 - spec/generate_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/tasks_spec.rb
 - spec/updater_spec.rb
 - spec/version_spec.rb