corundum 0.3.8 → 0.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGFmYzVlYTA4NmViNDNhM2E0MzAyZDlkNzliY2YzYjc1MTI3ZmNmMQ==
+    ZjMxMDhiMDI0ZTVkNDdlMTA3ODA1NTY5MDNlYWMwODk2MDFmYWNmNg==
   data.tar.gz: !binary |-
-    NzNlNzVmZGY4Y2VmNDM5MTE2MzZiYzIwNTFhYzg0M2FlYmYwMDAzMA==
+    NDNiMzU0NzFlOTljY2QzYjI4Y2Q5ZmRkODM0MGEwYzEyZmQ5ZWJmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmE1ODgyNTcxMWY4MDIwMTA3NThkNzU4OTgyZjdmMzZlYTBjZWY5YzFhZWJm
-    MmFkZTAzM2RlNzlhMzhmNWM1MTU2NjI3NDJjNjI1NTVlODBkMzdmOGVhM2Ix
-    ZDM3YzUyMzU4OTNkMmQ5ZjYwODU0YzZiMWI3NGU5YjgwMTQxMzM=
+    N2NiOWVmZDUyMTA5ODgxNDg2ZTJhMWQwYmMyODU0YjU4NmUzMTJmMTZkYzYw
+    ZTAyY2E4MWMzZDJlNzk2ZjZlZWM2NzE3MmIzM2QyN2ExZTMyOTM4OGJjZjEz
+    NWZhYzg1Y2JlZjIxOTcyZGJjZmYzYjBlMDk5NDU3ZGI1NDNlMWQ=
   data.tar.gz: !binary |-
-    OGRiNDMwYmU2NWM3MjE1NjA3M2NhMTI5OTBiMmQ1ZmIzZDdlMDdjMmFjNzg2
-    MzI4NjUwMGZiNWMxMDk5ZjY3OGVmZDZlMjk3MGQ1MDA5ZWY2N2Y1YzA3MDU3
-    NjQ3NzIzZmJiMzY4NTJiZjdhNWI0YzUzZDVkODE3NWNiOTZhMDI=
+    ZWRiMmFlZGUwNTM5ZWFiMzQ5ZThkZDJiNzM5MGIxODRhMjhmYzM3YzI4MzFh
+    OTlhNjY1ODJkMDFlYjA1ZWU5NzcwMmVjZjA1ODc5MTViNDk3YTY0MzAzMTQx
+    YzU0YTFkZGNmMzEzZTBmM2Y5OWEyMmE5YmE0ZWZjODc4ZTY3MjA=

data/lib/corundum.rb

@@ -1,6 +1,6 @@
 require 'corundum/configuration-store'
 require 'corundum/core'
-require 'mattock/tasklib'
+require 'mattock'
 
 module Corundum
   extend Rake::DSL

data/lib/corundum/browser-task.rb

@@ -17,7 +17,7 @@ module Corundum
 
     def resolve_configuration
       super
-      self.command = Mattock::CommandLine.new(browser, index_html)
+      self.command = cmd(browser, index_html)
     end
   end
 end

data/lib/corundum/github-pages.rb

@@ -7,7 +7,7 @@ module Corundum
     setting(:arguments, [])
 
     def command
-      Mattock::CommandLine.new("git", "--no-pager") do |cmd|
+      cmd("git", "--no-pager") do |cmd|
         cmd.options << subcommand
         arguments.each do |arg|
           cmd.options += [*arg]
@@ -31,14 +31,14 @@ module Corundum
       end
     end
 
-    def action
+    def action(*args)
       Dir.chdir target_dir do
         super
       end
     end
   end
 
-  class GithubPages < Mattock::TaskLib
+  class GithubPages < Mattock::CommandTaskLib
     default_namespace :publish_docs
 
     setting(:target_dir, "gh-pages")
@@ -63,7 +63,7 @@ module Corundum
     end
 
     def git_command(*args)
-      Mattock::CommandLine.new("git", "--no-pager") do |cmd|
+      cmd("git", "--no-pager") do |cmd|
         args.each do |arg|
           cmd.options += [*arg]
         end
@@ -86,40 +86,25 @@ module Corundum
         end
 
         InDirCommandTask.define_task(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)
-          end
-          t.command = Mattock::PrereqChain.new do |cmd|
-            cmd.add git_command("checkout", "-b", branch)
-            cmd.add Mattock::CommandLine.new("rm -rf *")
-            cmd.add git_command(%w{commit -a -m} + ["'Creating pages'"])
-            cmd.add git_command("push", "origin", branch)
-            cmd.add git_command("branch", "--set-upstream", branch, "origin/" + branch)
-          end
+          t.verify_command = git_command | cmd("grep", "-q", branch)
+          t.command = git_command("checkout", "-b", branch) &
+            cmd("rm -rf *") &
+            git_command(%w{commit -a -m} + ["'Creating pages'"]) &
+            git_command("push", "origin", branch) &
+            git_command("branch", "--set-upstream", branch, "origin/" + branch)
         end
 
         InDirCommandTask.define_task(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", "-b", branch)
-            chain.add git_command("branch", "--set-upstream", branch, "origin/" + branch)
-            chain.add Mattock::CommandLine.new("rm", "-f", '.git/index')
-            chain.add git_command("clean", "-fdx")
-          end
+          t.verify_command = git_command(%w{branch}) | cmd("grep", "-q", "'#{branch}'")
+          t.command = git_command("checkout", "-b", branch) &
+            git_command("branch", "--set-upstream", branch, "origin/" + branch) &
+            cmd("rm", "-f", '.git/index') &
+            git_command("clean", "-fdx")
         end
 
         InDirCommandTask.define_task(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
+          t.verify_command = git_command(%w{branch}) | cmd("grep", "-q", "'^[*] #{branch}'")
+          t.command = git_command("checkout", branch)
         end
 
         task :pull => [repo_dir, :on_branch] do
@@ -129,7 +114,7 @@ module Corundum
         end
 
         task :cleanup_repo => repo_dir do
-          Mattock::CommandLine.new("rm", "-f", File::join(repo_dir, "hooks", "*")).must_succeed!
+          cmd("rm", "-f", File::join(repo_dir, "hooks", "*")).must_succeed!
           File::open(File::join(repo_dir, ".gitignore"), "w") do |file|
             file.write ".sw?"
           end
@@ -140,13 +125,13 @@ module Corundum
         task :pre_publish => [repo_dir, target_dir]
 
         task :clobber_target => [:on_branch, :pull] do
-          Mattock::CommandLine.new(*%w{rm -rf}) do |cmd|
+          cmd(*%w{rm -rf}) do |cmd|
             cmd.options << target_dir + "/*"
           end.must_succeed!
         end
 
         task :assemble_docs => [docs_index, :pre_publish, :clobber_target] do
-          Mattock::CommandLine.new(*%w{cp -a}) do |cmd|
+          cmd(*%w{cp -a}) do |cmd|
             cmd.options << source_dir + "/*"
             cmd.options << target_dir
           end.must_succeed!

data/lib/corundum/rspec-task.rb

@@ -26,15 +26,12 @@ module Corundum
       ruby_command.options << ruby_opts if ruby_opts
       ruby_command.options << "-w" if warning
 
-      self.runner_command = Mattock::CommandLine.new(rspec_path) do |cmd|
+      self.runner_command = cmd(rspec_path) do |cmd|
         cmd.options << rspec_opts
         cmd.options << files_to_run
       end
 
-      self.command = Mattock::WrappingChain.new do |cmd|
-        cmd.add ruby_command
-        cmd.add runner_command
-      end
+      self.command = ruby_command - runner_command
 
       super
 

data/lib/corundum/version_control.rb

@@ -1,7 +1,7 @@
 require 'mattock/tasklib'
 
 module Corundum
-  class VersionControl < Mattock::TaskLib
+  class VersionControl < Mattock::CommandTaskLib
     default_namespace :version_control
 
     required_fields(:gemspec, :build_finished_file, :gemspec_files, :tag)

data/lib/corundum/version_control/git.rb

@@ -16,7 +16,7 @@ module Corundum
     end
 
     def git_command(*args)
-      Mattock::CommandLine.new("git", "--no-pager") do |cmd|
+      cmd("git", "--no-pager") do |cmd|
         args.each do |arg|
           cmd.options += [*arg]
         end

data/spec/smoking_spec.rb

@@ -1,8 +1,6 @@
 require 'corundum'
 require 'corundum/tasklibs'
 
-require 'corundum/rubyforge'
-
 module Corundum
   describe "A fairly complete Rakefile" do
     before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corundum
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
@@ -136,20 +136,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: caliph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: mattock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +267,6 @@ files:
 - lib/corundum/gem_building.rb
 - lib/corundum/tasklibs.rb
 - lib/corundum/simplecov.rb
-- lib/corundum/rubyforge.rb
 - lib/corundum/questionable-content.rb
 - lib/corundum/version_control.rb
 - lib/corundum/version_control/monotone.rb
@@ -336,7 +349,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
-- corundum-0.3.8 RDoc
+- corundum-0.3.9 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/corundum/rubyforge.rb

@@ -1,55 +0,0 @@
-require 'mattock/tasklib'
-
-#Big XXX: this totally isn't done.  It's some notes against ever wanting to
-#publish announcements to rubyforge ever again
-
-module Corundum
-  class Publishing < Mattock::TaskLib
-    default_namespace :rubyforge
-
-    setting(:rubyforge,  nested(:package_id => nil, :group_id => nil, :release_name => nil))
-    setting(:package_dir,  nil)
-    setting(:gemspec,  nil)
-
-    def define
-      desc "Publish the gem and its documentation to Rubyforge and Gemcutter"
-      task root_task => in_namespace(:docs, :rubyforge)
-
-      in_namespace do
-        desc 'Publish RDoc to RubyForge'
-        task :docs do
-          config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-          host = "#{config["username"]}@rubyforge.org"
-          remote_dir = "/var/www/gforge-projects/#{@rubyforge[:group_id]}"
-          local_dir = 'rubydoc'
-          sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
-        end
-
-        task :scrape_rubyforge do
-          require 'rubyforge'
-          forge = RubyForge.new
-          forge.configure
-          forge.scrape_project(@rubyforge[:package_id])
-        end
-
-        desc "Publishes to RubyForge"
-        task :rubyforge => [:docs, :scrape_rubyforge] do |t|
-          require 'rubyforge'
-          forge = RubyForge.new
-          forge.configure
-          files = [".gem", ".tar.gz", ".tar.bz2"].map do |extension|
-            File::join(@package_dir, @gemspec.full_name) + extension
-          end
-          release = forge.lookup("release", @rubyforge[:package_id])[@rubyforge[:release_name]] rescue nil
-          if release.nil?
-            forge.add_release(@rubyforge[:group_id], @rubyforge[:package_id], @rubyforge[:release_name], *files)
-          else
-            files.each do |file|
-              forge.add_file(@rubyforge[:group_id], @rubyforge[:package_id], @rubyforge[:release_name], file)
-            end
-          end
-        end
-      end
-    end
-  end
-end