corundum 0.0.9 → 0.0.10

data/lib/corundum/gemcutter.rb

@@ -90,7 +90,6 @@ module Corundum
           dep = Gem::Dependency.new(gemspec.name, "= #{gemspec.version}")
           fulfilling = checker.find_matching(dep,false,false,false)
           unless fulfilling.empty?
-            p fulfilling
             fail "Gem #{gemspec.full_name} is already pushed"
           end
         end

data/lib/corundum/github-pages.rb

@@ -24,13 +24,14 @@ module Corundum
     end
 
     def needed?
-      FileUtils.cd target_dir do
+      return true unless File.directory? target_dir
+      Dir.chdir target_dir do
         super
       end
     end
 
     def action
-      FileUtils.cd target_dir do
+      Dir.chdir target_dir do
         super
       end
     end
@@ -72,34 +73,14 @@ module Corundum
 
     def define
       in_namespace do
-        InDirCommandTask.new(self) do |t|
-          t.task_name = :on_branch
-          t.verify_command = Mattock::PipelineChain.new do |chain|
-            chain.add git_command(%w{branch})
-            chain.add Mattock::CommandLine.new("grep", "-q", "'^[*] #{branch}'")
-          end
-          t.command = Mattock::PrereqChain.new do |chain|
-            chain.add git_command("checkout", branch)
-          end
-        end
-
         file repo_dir do
           fail "Refusing to clobber existing #{target_dir}" if File.exists?(target_dir)
 
           url = git("config", "--get", "remote.origin.url").first
-
-          git("clone", url.chomp, "-b", branch, target_dir)
-          Mattock::CommandLine.new("rm", File::join(repo_dir, "hooks", "*")).must_succeed!
+          git("clone", url.chomp, target_dir)
         end
 
-        task :pull => [repo_dir, :on_branch] do
-          FileUtils.cd target_dir do
-            git("pull")
-          end
-        end
-
-        InDirCommandTask.new(self) do |t|
-          t.task_name = :setup
+        InDirCommandTask.new(self, :remote_branch => repo_dir) do |t|
           t.verify_command = Mattock::PipelineChain.new do |chain|
             chain.add git_command(%w{branch -r})
             chain.add Mattock::CommandLine.new("grep", "-q", branch)
@@ -112,9 +93,40 @@ module Corundum
             cmd.add git_command("branch", "--set-upstream", branch, "origin/" + branch)
           end
         end
-        task :setup => repo_dir
 
-        task :pre_publish => [repo_dir, :setup, :pull]
+        InDirCommandTask.new(self, :local_branch => :remote_branch) do |t|
+          t.verify_command = Mattock::PipelineChain.new do |chain|
+            chain.add git_command(%w{branch})
+            chain.add Mattock::CommandLine.new("grep", "-q", "'#{branch}'")
+          end
+          t.command = Mattock::PrereqChain.new do |chain|
+            chain.add git_command("checkout", "-t", branch)
+          end
+        end
+
+        InDirCommandTask.new(self, :on_branch => [:remote_branch, :local_branch]) do |t|
+          t.verify_command = Mattock::PipelineChain.new do |chain|
+            chain.add git_command(%w{branch})
+            chain.add Mattock::CommandLine.new("grep", "-q", "'^[*] #{branch}'")
+          end
+          t.command = Mattock::PrereqChain.new do |chain|
+            chain.add git_command("checkout", branch)
+          end
+        end
+
+        task :pull => [repo_dir, :on_branch] do
+          FileUtils.cd target_dir do
+            git("pull")
+          end
+        end
+
+        task :cleanup_repo => repo_dir do
+          Mattock::CommandLine.new("rm", "-f", File::join(repo_dir, "hooks", "*")).must_succeed!
+        end
+
+        file target_dir => [:on_branch, :cleanup_repo]
+
+        task :pre_publish => [repo_dir, target_dir, :pull]
 
         task :clobber_target => :on_branch do
           Mattock::CommandLine.new(*%w{rm -rf}) do |cmd|

data/lib/corundum/rspec.rb

@@ -17,6 +17,7 @@ module Corundum
       :warning, :rspec_path, :rspec_opts, :failure_message, :files_to_run
 
     def default_configuration(rspec)
+      super
       self.pattern = rspec.pattern
       self.ruby_opts = rspec.ruby_opts
       self.rspec_configs = rspec.rspec_configs
@@ -44,6 +45,7 @@ module Corundum
         cmd.add ruby_command
         cmd.add runner_command
       end
+      super
     end
   end
 

data/lib/corundum/yardoc.rb

@@ -2,24 +2,55 @@ require 'corundum/tasklib'
 require 'yard'
 
 module Corundum
-  class YARDoc < TaskLib
-    default_namespace :documentation
+  class DocumentationTask < TaskLib
+    setting :entry_point
+    setting :target_dir
+    setting :browser
+
+    def default_configuration(toolkit)
+      self.browser = toolkit.browser
+    end
+
+    def resolve_configuration
+      self.entry_point ||= File::join(target_dir, "index.html")
+    end
+
+    def define
+      directory target_dir
+
+      in_namespace do
+        desc "Open up a browser to view your documentation"
+        BrowserTask.new(self) do |t|
+          t.index_html = entry_point
+        end
+      end
+
+      desc "Generate documentation based on code using YARD"
+      task root_task => entry_point
+    end
+  end
+
+  class YARDoc < DocumentationTask
+    default_namespace :yardoc
 
     setting :gemspec
     setting :options, nil
-    setting :browser
-    setting :yardoc_index, nil
+    setting :entry_point, nil
 
     setting(:target_dir, "yardoc")
     setting(:readme, nil)
     setting(:files, nested(:code => [], :docs => []))
     setting(:extra_files, [])
 
+    def document_inputs
+      FileList["README*"] + files.code + files.docs + extra_files
+    end
+
     def default_configuration(toolkit)
+      super
       self.gemspec = toolkit.gemspec
       toolkit.files.copy_settings_to(self.files)
       self.files.docs = []
-      self.browser = toolkit.browser
     end
 
     def resolve_configuration
@@ -30,26 +61,16 @@ module Corundum
       unless files.docs.empty? and extra_files.empty?
         self.options += [ "-" ] + files.docs  + extra_files
       end
-      self.yardoc_index ||= File::join(target_dir, "index.html")
     end
 
     def define
-      directory target_dir
-
       in_namespace do
-        file yardoc_index =>
-        FileList["README*"] + files.code + files.docs + extra_files do
+        file entry_point => document_inputs do
           YARD::CLI::Yardoc.run( *(options) )
         end
-
-        desc "Open up a browser to view your documentation"
-        BrowserTask.new(self) do |t|
-          t.index_html = yardoc_index
-        end
       end
 
-      desc "Generate documentation based on code using YARD"
-      task root_task => yardoc_index
+      super
     end
   end
 end

data/spec/smoking_spec.rb

@@ -15,8 +15,9 @@ module Corundum
         gem = GemBuilding.new(tk)
         cutter = GemCutter.new(tk, gem)
         email = Email.new(tk)
-        vc = Monotone.new(tk)
+        vc = Git.new(tk)
         docs = YARDoc.new(tk)
+        pages = GithubPages.new(docs)
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: corundum
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Judson Lester
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: corundum
@@ -129,10 +129,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: *id010
@@ -280,7 +277,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- corundum-0.0.9 RDoc
+- corundum-0.0.10 RDoc
 require_paths: 
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -288,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 98791645
+      hash: -641191571
       segments: 
       - 0
       version: "0"