hen 0.4.6 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4386f412e1f6442e3932176d2ded0ce75ca29089
+  data.tar.gz: 40c21cef3077fe57135618443199aa3146eb843c
+SHA512:
+  metadata.gz: a8073e2e200bb5a8488d49011ddeb0f43701d94fcc1c0af647bd463a8cbe717246b229d5bf198426a53c0c63a192913462fc5fdb0a9f40da1f51d237fd38652d
+  data.tar.gz: 6b2c7e07c05a87081cf1f66441fb79e99f5d78d73d69b0c81cab40feb1366564004a624773e09152b26502b5d5587f54d2b8be42d09ace8f7fa5e91b1b180fe6

data/ChangeLog

@@ -1,5 +1,9 @@
 = Revision history for hen
 
+== 0.4.7 [unreleased]
+
+* Optionally specify Git remote with environment variable +HEN_REMOTE+.
+
 == 0.4.6 [2012-04-05]
 
 * Fixed `hen version`.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.4.6
+This documentation refers to hen version 0.4.7
 
 
 == DESCRIPTION
@@ -66,7 +66,7 @@ RubyGem::           <http://rubygems.org/gems/hen>
 
 == AUTHORS
 
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 
 
 == LICENSE AND COPYRIGHT
@@ -74,6 +74,8 @@ RubyGem::           <http://rubygems.org/gems/hen>
 Copyright (C) 2007-2012 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
+Copyright (C) 2013 Jens Wille
+
 hen is free software: you can redistribute it and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free
 Software Foundation, either version 3 of the License, or (at your option)

data/Rakefile

@@ -13,7 +13,7 @@ Hen.lay! {{
     :summary      => "Hoe or Echoe? No, thanks! Just a Rake " <<
                      "helper that fits my own personal style.",
     :author       => %q{Jens Wille},
-    :email        => %q{jens.wille@uni-koeln.de},
+    :email        => %q{jens.wille@gmail.com},
     :extra_files  => FileList['lib/hens/*.rake'].to_a,
     :dependencies => [['ruby-nuggets', '>= 0.8.4'], 'highline']
   }

data/bin/hen

@@ -5,12 +5,14 @@
 #                                                                             #
 # hen -- Just a Rake helper                                                   #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # hen is free software; you can redistribute it and/or modify it under the    #
 # terms of the GNU Affero General Public License as published by the Free     #

data/lib/hen.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # hen -- Just a Rake helper                                                   #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # hen is free software; you can redistribute it and/or modify it under the    #
 # terms of the GNU Affero General Public License as published by the Free     #

data/lib/hen/cli.rb

@@ -7,8 +7,10 @@
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # hen is free software; you can redistribute it and/or modify it under the    #
 # terms of the GNU Affero General Public License as published by the Free     #

data/lib/hen/dsl.rb

@@ -7,8 +7,10 @@
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # hen is free software; you can redistribute it and/or modify it under the    #
 # terms of the GNU Affero General Public License as published by the Free     #
@@ -126,6 +128,19 @@ class Hen
       }
     end
 
+    # Map +options+ hash to array of command line arguments.
+    def map_options(options)
+      options.map { |option, value|
+        option = '--' << option.to_s.tr('_', '-')
+
+        case value
+          when Array  then value.map { |_value| [option, _value] }
+          when String then [option, value]
+          else value ? option : nil
+        end
+      }.compact.flatten
+    end
+
     # Encapsulates tasks targeting at RubyForge, skipping those if no
     # RubyForge project is defined. Yields the RubyForge configuration
     # hash and, optionally, a proc to obtain RubyForge objects from (via
@@ -264,16 +279,30 @@ class Hen
           %x{git #{args.unshift(cmd.to_s.tr('_', '-')).join(' ')}}
         end
 
-        def remote_for_branch(branch)  # :nodoc:
-          run(:branch, '-r')[%r{(\S+)/#{Regexp.escape(branch)}$}, 1]
+        def remote_for_branch(branch, default = 'origin')  # :nodoc:
+          remotes = run(:branch, '-r').scan(%r{(\S+)/#{Regexp.escape(branch)}$})
+          remotes.flatten!
+
+          if env_remote = ENV['HEN_REMOTE']
+            env_remote if remotes.include?(env_remote)
+          else
+            remotes.include?(default) ? default : remotes.first
+          end
         end
 
         def url_for_remote(remote)  # :nodoc:
           run(:remote, '-v')[%r{^#{Regexp.escape(remote)}\s+(\S+)}, 1]
         end
 
-        def find_remote(regexp)  # :nodoc:
-          run(:remote, '-v').split($/).grep(regexp).first
+        def find_remote(regexp, default = 'origin')  # :nodoc:
+          remotes = run(:remote, '-v').split($/).grep(regexp)
+          remotes.map! { |x| x.split[0..1] }
+
+          if env_remote = ENV['HEN_REMOTE']
+            remotes.assoc(env_remote)
+          else
+            remotes.assoc(default) || remotes.first
+          end
         end
 
         def easy_clone(url, dir = '.', remote = 'origin')  # :nodoc:

data/lib/hen/version.rb

@@ -4,7 +4,7 @@ class Hen
 
     MAJOR = 0
     MINOR = 4
-    TINY  = 6
+    TINY  = 7
 
     class << self
 

data/lib/hens/rdoc.rake

@@ -58,23 +58,20 @@ Hen :rdoc do
 
   ### rdoc_options
 
-  rdoc_options = rdoc_options.map { |option, value|
-    option = '--' << option.to_s.tr('_', '-')
-    value.is_a?(String) ? [option, value] : value ? option : nil
-  }.compact.flatten
+  rdoc_opts = map_options(rdoc_options)
 
   # Make settings available to other hens
   RDOC_OPTIONS = {
     :rdoc_dir   => rdoc_dir,
     :rdoc_files => rdoc_files,
-    :options    => rdoc_options
+    :options    => rdoc_opts
   }
 
   unless rdoc_files.empty?
     rdoc_task = rdoc_klass.new(:doc) { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir
       rdoc.rdoc_files = rdoc_files
-      rdoc.options    = rdoc_options
+      rdoc.options    = rdoc_opts
     }
   else
     task :doc do
@@ -86,7 +83,7 @@ Hen :rdoc do
     rdoc_klass.new('doc:local') { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir + '.local'
       rdoc.rdoc_files = rdoc_files_local
-      rdoc.options    = rdoc_options
+      rdoc.options    = rdoc_opts
 
       extend_object(rdoc) {
         def local_description(desc); "#{desc} (including unmanaged files)"; end
@@ -108,13 +105,13 @@ Hen :rdoc do
       pages_url = git.url_for_remote(git_remote)
       clone_dir = ".#{git_branch}"
     elsif git_remote = git.find_remote(/git@github\.com:/)
-      git_remote, clone_url = git_remote.split[0..1]
+      git_remote, clone_url = git_remote
       clone_dir = ".clone-#{$$}-#{rand(100)}"
     end
 
     if pages_url  # inside git repo and found gh-pages branch
 
-      desc "Publish RDoc to GitHub pages"
+      desc "Publish RDoc to GitHub pages on #{git_remote}"
       task 'doc:publish:github' => :doc do
         rm_rf clone_dir
 

data/lib/hens/spec.rake

@@ -26,15 +26,24 @@ Hen :spec do
 
     if spec_helper && File.readable?(spec_helper)
       spec_files.delete(spec_helper)
-      spec_files.unshift(spec_helper)
+
+      begin
+        require 'rspec/core/version'
+
+        # RSpec began sorting test files in version 2.12.0 (c76c1e6)
+        curr_version = Gem::Version.new(RSpec::Core::Version::STRING)
+        sort_version = Gem::Version.new('2.12.0')
+
+        raise LoadError if curr_version < sort_version
+
+        (spec_options[:require] ||= []) << File.basename(spec_helper, '.rb')
+      rescue LoadError, NameError
+        spec_files.unshift(spec_helper)
+      end
     end
 
     opts_file = spec_options.delete(:options)
-
-    spec_opts = spec_options.map { |option, value|
-      option = '--' << option.to_s.tr('_', '-')
-      value.is_a?(String) ? [option, value] : value ? option : nil
-    }.compact.flatten
+    spec_opts = map_options(spec_options)
 
     if opts_file && File.readable?(opts_file)
       File.readlines(opts_file).each { |l| spec_opts << l.chomp }

metadata

@@ -1,124 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hen
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 6
-  version: 0.4.6
+version: !ruby/object:Gem::Version
+  version: 0.4.7
 platform: ruby
-authors: 
+authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-nuggets
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.
-email: jens.wille@uni-koeln.de
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal
+  style.
+email: jens.wille@gmail.com
+executables:
 - hen
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - COPYING
 - ChangeLog
-files: 
+files:
+- lib/hen.rb
+- lib/hen/cli.rb
 - lib/hen/dsl.rb
 - lib/hen/version.rb
-- lib/hen/cli.rb
-- lib/hen.rb
 - bin/hen
-- lib/hens/rdoc.rake
-- lib/hens/test.rake
 - lib/hens/gem.rake
+- lib/hens/rdoc.rake
 - lib/hens/spec.rake
-- ChangeLog
+- lib/hens/test.rake
 - COPYING
+- ChangeLog
 - README
 - Rakefile
-- example/hens/sample.rake
 - example/_henrc
-- example/project/ChangeLog
-- example/project/_gitignore
+- example/hens/sample.rake
 - example/project/COPYING
-- example/project/lib/__progname__/version.rb
-- example/project/lib/__progname__.rb
+- example/project/ChangeLog
 - example/project/README
 - example/project/Rakefile
+- example/project/_gitignore
+- example/project/lib/__progname__.rb
+- example/project/lib/__progname__/version.rb
 homepage: http://prometheus.rubyforge.org/hen
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
-- README
+rdoc_options:
 - --charset
 - UTF-8
-- --title
-- hen Application documentation (v0.4.6)
-- --all
 - --line-numbers
-require_paths: 
+- --all
+- --title
+- hen Application documentation (v0.4.7)
+- --main
+- README
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: prometheus
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.
 test_files: []
-