sup

commit a30b24c16f79031ecbf4160386a1c9ff36de9268
parent a6e6b04f20d574080b9f6a85286405673abc3b8b
Author: Whyme Lyu <callme5long@gmail.com>
Date:   Fri,  3 May 2013 21:07:33 +0800

Don't use sup-{version,files}.rb

Diffstat:

5 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -44,8 +44,6 @@ class Module
 end
 
 module Redwood
-  VERSION = "git"
-
   BASE_DIR   = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
   CONFIG_FN  = File.join(BASE_DIR, "config.yaml")
   COLOR_FN   = File.join(BASE_DIR, "colors.yaml")
@@ -336,6 +334,7 @@ EOS
                   :load_config, :managers
 end
 
+require 'sup/version'
 require "sup/util"
 require "sup/hook"
 require "sup/time"
diff --git a/lib/sup/version.rb b/lib/sup/version.rb
@@ -0,0 +1,3 @@
+module Redwood
+  VERSION = "git"
+end
diff --git a/sup-files.rb b/sup-files.rb
@@ -1,11 +0,0 @@
-SUP_LIB_DIRS = %w(lib lib/sup lib/sup/modes)
-SUP_EXECUTABLES = %w(sup sup-add sup-config sup-dump sup-import-dump sup-recover-sources sup-sync sup-sync-back sup-tweak-labels)
-SUP_EXTRA_FILES = %w(CONTRIBUTORS README.txt LICENSE History.txt ReleaseNotes)
-SUP_FILES =
-  SUP_EXTRA_FILES +
-  SUP_EXECUTABLES.map { |f| "bin/#{f}" } +
-  SUP_LIB_DIRS.map { |d| Dir["#{d}/*.rb"] }.flatten
-
-if $0 == __FILE__ # if executed from commandline
-  puts SUP_FILES
-end
diff --git a/sup-version.rb b/sup-version.rb
@@ -1,15 +0,0 @@
-## allow people who use development versions by running "rake gem"
-## and installing the resulting gem it to be able to do this. (gem
-## versions must be in dotted-digit notation only and can be passed
-## with the REL environment variable to "rake gem").
-SUP_VERSION = if ENV['REL']
-  ENV['REL']
-else
-  $:.unshift 'lib' # force loading from ./lib/ if it exists
-  require 'sup'
-  if Redwood::VERSION == "git"
-    "999"
-  else
-    Redwood::VERSION
-  end
-end
diff --git a/sup.gemspec b/sup.gemspec
@@ -1,15 +1,21 @@
-unless Kernel.respond_to?(:require_relative)
-  require "./sup-files"
-  require "./sup-version"
-else
-  require_relative "sup-files"
-  require_relative "sup-version"
-end
+lib = File.expand_path("../lib", __FILE__)
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'sup/version'
+
+# Files
+SUP_EXECUTABLES = %w(sup sup-add sup-config sup-dump sup-import-dump sup-recover-sources sup-sync sup-sync-back sup-tweak-labels)
+SUP_EXTRA_FILES = %w(CONTRIBUTORS README.txt LICENSE History.txt ReleaseNotes)
+SUP_FILES =
+  SUP_EXTRA_FILES +
+  SUP_EXECUTABLES.map { |f| "bin/#{f}" } +
+  Dir["lib/**/*.rb"]
+
 
 module Redwood
   Gemspec = Gem::Specification.new do |s|
     s.name = %q{sup}
-    s.version = SUP_VERSION
+    s.version = ENV["REL"] || (::Redwood::VERSION == "git" ? "999" : ::Redwood::VERSION)
     s.date = Time.now.strftime "%Y-%m-%d"
     s.authors = ["William Morgan"]
     s.email   = "sup-talk@rubyforge.org"