p4ruby 1.0.0 → 1.0.1

data/README

@@ -3,24 +3,7 @@
 
 This is only an installer for the P4Ruby package by Perforce Software.
 
-P4Ruby was recently included as an official package supported by
-Perforce, with minor changes.  Tony Smith's original P4Ruby public
-depot is here
-http://public.perforce.com/guest/tony_smith/perforce/API/Ruby/index.html
-with documentation
-http://public.perforce.com/guest/tony_smith/perforce/API/Ruby/main/doc/index.html.
-Changes in the new package are described here
-http://perforce.com/perforce/doc.081/user/p4rubynotes.txt.
-
-<b>Note:</b> For Windows, this installer currently only supports the
-cygwin version.  If you are installing cygwin for the first time,
-select ruby along with g++ (in the Devel category) inside the cygwin
-installer (http://cygwin.com).
-
-Users may be interested in a simplified interface to Perforce at
-http://perforce.rubyforge.org (shameless plug, sorry).
-
-=== Install
+== Install
 
   % gem install p4ruby
 
@@ -40,25 +23,22 @@ installs it.  Some options are available,
     --list-platforms     List available platforms for the given version.
     --gem                Gem configuration (for the gem installer).
     --uninstall          Uninstall.
+    --local              Use the local files in work/distfiles (for manual download)
 
-=== Note
-
-If you are on a case-sensitive filesystem, be aware that 'P4' must be
-capitalized in the <em>require</em> line,
-
-  require 'P4'
-
-=== Download (this installer only)
+== Download (this installer only)
 
 * http://rubyforge.org/frs/?group_id=6957
 
-=== Repository (this installer only)
+== Links
 
-* http://github.com/quix/p4ruby
+* Tony Smith's original P4Ruby {public depot}[http://public.perforce.com/guest/tony_smith/perforce/API/Ruby/index.html] and {documentation}[http://public.perforce.com/guest/tony_smith/perforce/API/Ruby/main/doc/index.html].
+* Changes[http://perforce.com/perforce/doc.081/user/p4rubynotes.txt] in the Perforce P4Ruby official package.
+* {Repository (this installer only)}[http://github.com/quix/p4ruby]
+* Users may be interested in a simplified interface to P4Ruby at http://perforce.rubyforge.org.
 
-=== Credits
+== Credits
 
-==== P4Ruby
+=== P4Ruby
  
  Copyright (c) 1997-2007, Perforce Software, Inc.  All rights reserved.
  
@@ -85,7 +65,7 @@ capitalized in the <em>require</em> line,
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
-==== Installer and Gem
+=== Installer and Gem
  
  This ruby package (install.rb and associated files) was written by
  James M. Lawrence, Copyright (c) 2008 ImaginEngine, Inc.  Distributed

data/install.rb

@@ -7,18 +7,24 @@ require 'rbconfig'
 require 'ostruct'
 require 'fileutils'
 require 'optparse'
+require 'pathname'
 
 class Installer
   include FileUtils
 
+  CONFIG = Config::CONFIG
+
   def parse_command_line
     OptionParser.new("Usage: ruby install.rb [options]", 24, "") { |parser|
-      parser.on("--version NN.N",
-                "Version to download, e.g. 08.1. Default finds latest.") {
+      parser.on(
+        "--version NN.N",
+        "Version to download, e.g. 08.1. Default finds latest.") {
         |version|
         @s.version = version
       }
-      parser.on("--list-versions", "List available versions.") {
+      parser.on(
+        "--list-versions",
+        "List available versions.") {
         @s.list_versions = true
       }
       parser.on(
@@ -27,16 +33,26 @@ class Installer
         |platform|
         @s.platform = platform
       }
-      parser.on("--list-platforms",
-                "List available platforms for the given version.") {
+      parser.on(
+        "--list-platforms",
+        "List available platforms for the given version.") {
         @s.list_platforms = true
       }
-      parser.on("--gem", "Gem configuration (for the gem installer).") {
+      parser.on(
+        "--gem",
+        "Gem configuration (for the gem installer).") {
         @s.gem = true
       }
-      parser.on("--uninstall", "Uninstall.") {
+      parser.on(
+        "--uninstall",
+        "Uninstall.") {
         @s.uninstall = true
       }
+      parser.on(
+        "--local",
+        "Use the local files in work/distfiles (for manual download)") {
+        @s.local = true
+      }
       parser.parse(ARGV)
     }
   end
@@ -52,28 +68,36 @@ class Installer
     elsif @s.list_versions
       list_versions
     elsif @s.platform
-      rm_rf(@s.work_dir)
-      fetch
-      build
-      install
+      if @s.platform =~ %r!\Ant!
+        windows_install
+      else
+        fetch
+        build
+        install
+      end
     else
       platform_fail
     end
   end
 
   def config
+    if CONFIG["LIBRUBYARG_SHARED"].empty?
+      raise "error: ruby must be configured with --enable-shared"
+    end
     @s.server = "ftp.perforce.com"
-    @s.server_top_dir = "perforce"
+    @s.server_top_dir = Pathname.new "perforce"
 
-    @s.work_dir = "work"
-    @s.distfiles_dir = "#{@s.work_dir}/distfiles"
-    @s.build_dir = "#{@s.work_dir}/build"
+    @s.work_dir = Pathname.new "work"
+    @s.distfiles_dir = @s.work_dir + "distfiles"
+    @s.build_dir = @s.work_dir + "build"
 
-    @s.p4api =  LazyStruct.new.tap { |t| t.file = "p4api.tgz" }
-    @s.p4ruby = LazyStruct.new.tap { |t| t.file = "p4ruby.tgz" }
+    @s.p4api =  LazyStruct.new.tap { |t| t.file = Pathname.new "p4api.tgz" }
+    @s.p4ruby = LazyStruct.new.tap { |t| t.file = Pathname.new "p4ruby.tgz" }
     @s.specs = [ @s.p4ruby, @s.p4api ]
     @s.specs.each { |spec|
-      spec.local = "#{@s.distfiles_dir}/#{spec.file}"
+      spec.attribute(:local) {
+        @s.distfiles_dir + spec.file
+      }
     }
     
     unless @s.platform
@@ -89,53 +113,66 @@ class Installer
     end
 
     @s.attribute(:version_dir) {
-      "#{@s.server_top_dir}/r#{@s.version}"
+      @s.server_top_dir + "r#{@s.version}"
     }
     @s.p4api.attribute(:remote) {
-      "#{@s.version_dir}/bin.#{@s.platform}/#{@s.p4api.file}"
+      @s.version_dir + "bin.#{@s.platform}" + @s.p4api.file
     }
     @s.p4ruby.attribute(:remote) {
-      "#{@s.version_dir}/tools/#{@s.p4ruby.file}"
+      @s.version_dir + "tools" + @s.p4ruby.file
     }
     @s.attribute(:ftp) {
       Net::FTP.new(@s.server).tap { |t| t.passive = true ; t.login }
     }
   end
 
-  def guess_platform
-    base =
-      case RUBY_PLATFORM
-      when %r!cygwin!i
-        "cygwin"
-      when %r!(mswin|mingw)!i
-        "nt"
-      when %r!darwin!i
-        "darwin80"
-      when %r!linux!i
-        "linux" +
-        if match = `uname -a`.match(%r!linux\s+\S+\s+(\d+)\.(\d+)!i)
-          match.captures.join
-        else
-          "26"
-        end
-      end
+  def find_os_version(os)
+    if match = `uname -a`.match(%r!#{os}\s+\S+\s+(\d+)\.(\d+)!i)
+      match.captures.join
+    end
+  end
 
-    if base.nil?
-      nil
+  def guess_platform(opts = {})
+    config_os = CONFIG["target_os"].downcase
+    bit64 = (1.size == 8)
+    windows_cpu = (bit64 ? "x64" : "x86")
+
+    if config_os =~ %r!cygwin!i
+      "cygwin" + windows_cpu
+    elsif config_os =~ %r!(mswin|mingw)!i
+      "nt" + windows_cpu
+    elsif @s.local
+      "<local>"
     else
-      bit64 = (1.size == 8 ? "_64" : "")
-
-      base +
-      case RUBY_PLATFORM
-      when %r!ia!i
-        "ia64"
-      when %r!86!
-        "x86" + bit64
-      when %r!darwin!
-        if `uname -a`.chomp =~ %r!86\Z!
-          "x86" + bit64
+      if (match = config_os.match(%r!\A\D+!)).nil?
+        nil
+      else
+        os = match[0]
+        version = find_os_version(os)
+        if version.nil?
+          nil
         else
-          "ppc"
+          cpu = 
+            case CONFIG["target_cpu"]
+            when %r!ia!i
+              "ia64"
+            when %r!86!
+              "x86" + (bit64 ? "_64" : "") # note: with '_'
+            when %r!(ppc|sparc)!i
+              $1 + (bit64 ? "64" : "")     # note: without '_'
+            else
+              ""
+            end
+          
+          available_platforms = platforms
+          platform = nil
+          version.to_i.downto(0) { |n|
+            platform = [os, n.to_s, cpu].join
+            if available_platforms.include? platform
+              break
+            end
+          }
+          platform
         end
       end
     end
@@ -159,7 +196,7 @@ class Installer
   
       \tftp://#{@s.server}/#{@s.p4api.remote}
   
-      Copy it to #{@s.p4api.local} and run install.rb again.
+      Copy it to #{@s.p4api.local} and run install.rb --local.
     }.gsub(%r!^ +(?=\S)!, "")
 
     mkdir_p(@s.distfiles_dir)
@@ -178,11 +215,17 @@ class Installer
     sys("tar", "zxvf", distfile, "-C", target_dir)
   end
 
-  def fetch
-    @s.specs.each { |spec|
+  def fetch_spec(spec)
+    unless @s.local
       mkdir_p(File.dirname(spec.local))
       puts "downloading ftp://#{@s.server}/#{spec.remote} ..."
       @s.ftp.getbinaryfile(spec.remote, spec.local)
+    end
+  end
+
+  def fetch
+    @s.specs.each { |spec|
+      fetch_spec(spec)
     }
   end
 
@@ -228,19 +271,19 @@ class Installer
     versions.last
   end
 
-  def fix_makefile
-    replace_file("Makefile") { |contents|
-      contents.sub(%r!^LIBS = .*?$!) { |match|
-        match + " -lruby"
-      }
-    }
+  def make(*args)
+    sys("make", *args)
   end
 
-  def build
-    ruby = File.join(
-      Config::CONFIG["bindir"],
-      Config::CONFIG["RUBY_INSTALL_NAME"])
+  def ruby(*args)
+    exe = File.join(
+      CONFIG["bindir"],
+      CONFIG["RUBY_INSTALL_NAME"])
+    sys(exe, *args)
+  end
 
+  def build
+    rm_rf(@s.build_dir)
     mkdir_p(@s.build_dir)
 
     @s.specs.each { |spec|
@@ -248,39 +291,28 @@ class Installer
     }
 
     Dir.chdir(@s.build_dir) {
-      api_dir = Dir["p4api*"].last
-      p4ruby_dir = Dir["p4ruby*"].last
+      api_dir = Pathname.glob("p4api*").last
+      p4ruby_dir = Pathname.glob("p4ruby*").last
       Dir.chdir(p4ruby_dir) {
-        sys(ruby, "p4conf.rb", "--apidir", "../#{api_dir}")
-        fix_makefile
+        ruby("p4conf.rb", "--apidir", "../#{api_dir}")
         make
       }
-      @s.p4ruby_build_dir = "#{@s.build_dir}/#{p4ruby_dir}"
+      @s.p4ruby_build_dir = @s.build_dir + p4ruby_dir
     }
   end
 
-  def make(*args)
-    exe = 
-      if RUBY_PLATFORM =~ %r!mswin!i
-        "nmake"
-      else
-        "make"
-      end
-    sys(exe, *args)
-  end
-
   def install
     if @s.gem
-      rb_file = "lib/P4.rb"
+      rb_file = Pathname.new("lib") + "P4.rb"
       rm_f(rb_file)
       mkdir_p(File.dirname(rb_file))
-      cp("#{@s.p4ruby_build_dir}/#{rb_file}", rb_file)
+      cp(@s.p4ruby_build_dir + rb_file, rb_file)
 
-      dlext = Config::CONFIG["DLEXT"]
-      so_file = "ext/P4.#{dlext}"
+      dlext = CONFIG["DLEXT"]
+      so_file = Pathname.new("ext") + "P4.#{dlext}"
       rm_f(so_file)
       mkdir_p(File.dirname(so_file))
-      cp("#{@s.p4ruby_build_dir}/#{File.basename(so_file)}", so_file)
+      cp(@s.p4ruby_build_dir + so_file.basename, so_file)
     else
       Dir.chdir(@s.p4ruby_build_dir) {
         make "install"
@@ -288,9 +320,30 @@ class Installer
     end
   end
 
+  def windows_install
+    #
+    # p4ruby is where the p4api is located on the perforce server
+    # -- switcharoo --
+    #
+    spec = @s.p4api
+    
+    version = [CONFIG["MAJOR"], CONFIG["MINOR"]].join
+    spec.file = "p4ruby#{version}.exe"
+    fetch_spec(spec)
+
+    if system(spec.local, "/S", "/v/qn")
+      puts "Installed files:"
+      puts installed_p4ruby_files
+    else
+      puts "**** The P4Ruby installer failed!"
+      puts "**** Re-run it manually here: "
+      puts File.expand_path(spec.local)
+    end
+  end
+
   def installed_p4ruby_files
-    [ File.join(Config::CONFIG["sitelibdir"], "P4.rb") ] +
-    Dir[File.join(Config::CONFIG["sitearchdir"], "P4.*")]
+    [ Pathname.new(CONFIG["sitelibdir"]) + "P4.rb" ] +
+    Pathname.glob(Pathname.new(CONFIG["sitearchdir"]) + "P4.*")
   end
 
   def uninstall
@@ -363,13 +416,5 @@ class LazyStruct < OpenStruct
   include Mixin
 end
 
-def replace_file(file)
-  old_contents = File.read(file)
-  yield(old_contents).tap { |new_contents|
-    File.open(file, "w") { |output|
-      output.print(new_contents)
-    }
-  }
-end
-
+STDOUT.sync = true
 Installer.new.run

data/p4ruby.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new { |t| 
   t.name = "p4ruby"
-  t.version = "1.0.0"
+  t.version = "1.0.1"
   t.summary = "Ruby interface to the Perforce API"
   t.author = "Perforce Software (ruby gem by James M. Lawrence)"
   t.email = "quixoticsycophant@gmail.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: p4ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Perforce Software (ruby gem by James M. Lawrence)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 -04:00
+date: 2008-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: p4ruby
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Ruby interface to the Perforce API