ore-tasks 0.4.1 → 0.4.2

data/ChangeLog.md

@@ -1,3 +1,16 @@
+### 0.4.2 / 2011-02-15
+
+* Moved SCM specific logic into {Ore::SCM::Tasks}.
+* Only `git push` if the Git repository has remote sources.
+* Added the `status` task which checks for uncommitted changes,
+  and lists modified files.
+* Have the `build` task depend on the `status` task, to prevent gems
+  from being built, installed or pushed which contain uncomitted changes.
+
+### 0.4.1 / 2011-02-12
+
+* Emergency release due to typo.
+
 ### 0.4.0 / 2011-02-12
 
 * Added {Ore::Tasks#gem}.

data/Rakefile

@@ -8,7 +8,7 @@ require 'ore/tasks'
 Ore::Tasks.new
 
 begin
-  gem 'rspec', '~> 2.4.0'
+  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
   
   RSpec::Core::RakeTask.new

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore-tasks
-version: 0.4.1
+version: 0.4.2
 summary: Rake tasks for managing and releasing RubyGems using Ore.
 description:
   Simple Rake tasks for managing and releasing a RubyGem project generated
@@ -10,8 +10,8 @@ homepage: http://github.com/ruby-ore/ore-tasks
 has_yard: true
 
 dependencies:
-  ore-core: ~> 0.1.3
+  ore-core: ~> 0.1, >= 0.1.3
 
 development_dependencies:
-  rspec: ~> 2.4.0
+  rspec: ~> 2.4
   yard: ~> 0.6.0

data/lib/ore/scm/tasks.rb

@@ -0,0 +1,2 @@
+require 'ore/scm/tasks/git'
+require 'ore/scm/tasks/tasks'

data/lib/ore/scm/tasks/git.rb

@@ -0,0 +1,55 @@
+module Ore
+  module SCM
+    module Tasks
+      module Git
+        #
+        # Registers the `sync` and `tag` release tasks when extended.
+        #
+        def self.extended(tasks)
+          tasks.release_tasks.unshift('sync')
+          tasks.release_tasks.push('tag')
+        end
+
+        #
+        # Defines the [Git](http://www.git-scm.com) specific tasks.
+        #
+        def define_scm_tasks
+          @remote = `git remote`.empty?
+
+          task :sync do
+            run 'git', 'push' if @remote
+          end
+
+          desc 'Tags a release and pushes the tag'
+          task :tag do
+            run 'git', 'tag', "v#{@project.version}"
+            run 'git', 'push', '--tags' if @remote
+          end
+        end
+
+        #
+        # Lists the modified files within the project.
+        #
+        # @return [Hash{String => String}]
+        #   The paths and statuses of the modified files.
+        #
+        # @since 0.4.2
+        #
+        def dirty_files
+          files = {}
+
+          `git status --porcelain`.each_line do |line|
+            status, name = line.chomp.split
+
+            # ignore untracked files
+            unless status == '??'
+              files[name] = status
+            end
+          end
+
+          return files
+        end
+      end
+    end
+  end
+end

data/lib/ore/scm/tasks/tasks.rb

@@ -0,0 +1,10 @@
+require 'ore/scm/tasks/git'
+
+module Ore
+  module SCM
+    module Tasks
+      # The supported SCMs and their tasks
+      SUPPORTED = {:git => Git}
+    end
+  end
+end

data/lib/ore/tasks.rb

@@ -1,3 +1,4 @@
+require 'ore/scm/tasks'
 require 'ore/project'
 
 require 'rake/tasklib'
@@ -29,8 +30,20 @@ module Ore
     # Defines the core Ore tasks.
     #
     def define_core_tasks
+      task :status do
+        changes = dirty_files
+
+        unless changes.empty?
+          puts "The following files were modified:"
+          changes.each { |path,status| puts "#{status}\t#{path}" }
+          puts
+
+          abort "The project has uncommitted changes!"
+        end
+      end
+
       desc "Only builds a Gem"
-      task :build do
+      task :build => :status do
         @project.build!
       end
 
@@ -99,24 +112,6 @@ module Ore
       end
     end
 
-    #
-    # Defines the Ore tasks specific to [git](http://www.git-scm.com).
-    #
-    def define_git_tasks
-      task :sync do
-        run 'git', 'push'
-      end
-
-      desc 'Tags a release and pushes the tag'
-      task :tag do
-        run 'git', 'tag', "v#{@project.version}"
-        run 'git', 'push', '--tags'
-      end
-
-      @release_tasks.unshift('sync')
-      @release_tasks.push('tag')
-    end
-
     #
     # Defines the RubyGems specific tasks.
     #
@@ -149,9 +144,9 @@ module Ore
     def define
       define_core_tasks
 
-      case @project.scm
-      when :git
-        define_git_tasks
+      if (scm_tasks = SCM::Tasks::SUPPORTED[@project.scm])
+        extend scm_tasks
+        define_scm_tasks
       end
 
       unless @project.bundler?
@@ -198,5 +193,17 @@ module Ore
       run(RUBY,'-S','gem',*arguments)
     end
 
+    #
+    # Lists the modified files within the project.
+    #
+    # @return [Hash{String => String}]
+    #   The paths and statuses of the modified files.
+    #
+    # @since 0.4.2
+    #
+    def dirty_files
+      {}
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-gem 'rspec', '~> 2.4.0'
+gem 'rspec', '~> 2.4'
 require 'rspec'
-require 'ore/tasks/version'
 
+require 'ore/tasks/version'
 include Ore::Tasks

metadata

@@ -2,7 +2,7 @@
 name: ore-tasks
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,6 +20,9 @@ dependencies:
     none: false
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.1.3
   type: :runtime
@@ -32,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: "2.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -66,6 +69,9 @@ files:
 - README.md
 - Rakefile
 - gemspec.yml
+- lib/ore/scm/tasks.rb
+- lib/ore/scm/tasks/git.rb
+- lib/ore/scm/tasks/tasks.rb
 - lib/ore/tasks.rb
 - ore-tasks.gemspec
 - spec/spec_helper.rb