p4ruby 1.0.11 → 2012.1Beta

data/install.rb

@@ -1,6 +1,7 @@
 #
 # Author: James M. Lawrence <quixoticsycophant@gmail.com>.
 #
+#Updated by Brett Bates and Jennifer Bottom.
 
 require 'net/ftp'
 require 'rbconfig'
@@ -8,6 +9,7 @@ require 'ostruct'
 require 'fileutils'
 require 'optparse'
 require 'pathname'
+require 'rubygems'
 
 class Installer
   include FileUtils
@@ -112,6 +114,11 @@ class Installer
       raise "error: ruby must be configured with --enable-shared"
     end
 
+    @s.ftp = Net::FTP.new(SERVER).tap { |t|
+      t.passive = true
+      t.login
+    }
+
     @s.p4api =  LazyStruct.new.tap { |t|
       t.basename = P4API_REMOTE_BASENAME
     }
@@ -122,46 +129,36 @@ class Installer
 
     @s.specs = [ @s.p4ruby, @s.p4api ]
     @s.specs.each { |spec|
-      spec.attribute(:local) {
-        DISTFILES_DIR + spec.basename
-      }
+      spec.local = DISTFILES_DIR + spec.basename
     }
     
-    unless @s.platform
-      @s.attribute(:platform) {
-        guess_platform
-      }
+    unless @s.version
+      @s.version = latest_version
     end
 
-    unless @s.version
-      @s.attribute(:version) {
-        latest_version
-      }
+    @s.version_dir = SERVER_TOP_DIR + "r#{@s.version}"
+
+    unless @s.platform
+      @s.platform = guess_platform
     end
 
-    @s.attribute(:version_dir) {
-      SERVER_TOP_DIR + "r#{@s.version}"
-    }
+    if @s.platform =~ /nt/
+      @s.p4api.remote = @s.version_dir + "bin.#{@s.platform}"
+    else
+      @s.p4api.remote = @s.version_dir + "bin.#{@s.platform}" + @s.p4api.basename
+      @s.p4ruby.remote = @s.version_dir + "bin.tools" + @s.p4ruby.basename
+    end
 
-    @s.p4api.attribute(:remote) {
-      @s.version_dir + "bin.#{@s.platform}" + @s.p4api.basename
-    }
-    @s.p4ruby.attribute(:remote) {
-      @s.version_dir + "bin.tools" + @s.p4ruby.basename
-    }
 
-    @s.attribute(:ftp) {
-      Net::FTP.new(SERVER).tap { |t|
-        t.passive = true
-        t.login
-      }
-    }
   end
 
   def guess_cpu
     if CONFIG["target_os"] =~ %r!darwin!
-      # specific binaries were removed in p4api-09.1
-      "u"
+      if CONFIG["build"] =~ /i686|x86_64/
+        "x86_64"
+      else
+        "x86"
+      end
     else
       case CONFIG["target_cpu"]
       when %r!ia!i
@@ -183,11 +180,17 @@ class Installer
       version = match.captures.join
       cpu = guess_cpu
       platforms = self.platforms
-      (0..version.to_i).map { |n|
+      built_platforms = (0..version.to_i).map { |n|
         [os, n.to_s, cpu].join
       }.select { |platform|
         platforms.include? platform
-      }.last
+      }
+      if os =~ /darwin/
+        built_platforms.pop
+        built_platforms.last
+      else
+        built_platforms.last
+      end
     else
       nil
     end
@@ -299,7 +302,15 @@ class Installer
   end
 
   def latest_version
-    versions.last
+    versions.reverse_each{ |v|
+      begin
+        remote_files_matching("#{SERVER_TOP_DIR}/r#{v}/bin.tools",/p4ruby/) do
+          return v
+        end
+      rescue
+        next
+      end
+    }
   end
 
   def make(*args)
@@ -372,6 +383,21 @@ class Installer
     end
   end
 
+  def find_ruby_version(spec)
+    remote_files_matching(spec.remote, /p4ruby\d\d.exe/) {|r_ver|
+
+      #Find the latest version of p4ruby for this version of ruby
+      v_max = CONFIG["MAJOR"]
+      v_min = CONFIG["MINOR"]
+      version = [v_max, v_min].join
+      if r_ver.to_s =~ /p4ruby#{version}.exe/
+        return "p4ruby#{version}.exe"
+      end
+
+    }
+    nil
+  end
+
   def windows_install
     #
     # For Windows, p4ruby is located in the p4api directory on the
@@ -379,8 +405,12 @@ class Installer
     #
     spec = @s.p4api
     
-    version = [CONFIG["MAJOR"], CONFIG["MINOR"]].join
-    spec.basename = "p4ruby#{version}.exe"
+    p4ruby_exe = find_ruby_version(spec)
+    if p4ruby_exe && !(spec.remote.to_s =~ /p4ruby/)
+      spec.remote += p4ruby_exe.to_s
+    else
+      abort("Failed to find a suitable p4ruby executable for ruby #{CONFIG["MAJOR"]}.#{CONFIG["MINOR"]}")
+    end
     fetch_spec(spec)
 
     error = lambda {
@@ -390,12 +420,13 @@ class Installer
     }
 
     puts "running Perforce P4Ruby Windows installer..."
-    if system(spec.local, "/S", "/v/qn")
+    if system(spec.local.to_s, "/S", "/v", "/qn")
       if @s.gem_config
         sleep(1)
         raw_install_to_gem_install
         sleep(1)
-        unless system(spec.local, "/V", "/x", "/S", "/v/qn")
+#Without the -x flag a permissions error raised on Windows.
+        unless system(spec.local, "/V", "/S", "/x", "/v/qn")
           # We don't much care if this fails; just write to the log
           puts "Note: the Perforce P4Ruby Windows uninstaller failed."
         end

data/p4ruby.gemspec

@@ -1,15 +1,16 @@
 
 Gem::Specification.new { |t| 
   t.name = "p4ruby"
-  t.version = "1.0.11"
+  t.version = "2012.1Beta"
   t.summary = "Ruby interface to the Perforce API"
   t.description = t.summary + "."
   t.author = "Perforce Software (ruby gem by James M. Lawrence)"
-  t.email = "quixoticsycophant@gmail.com"
+  t.email = "p4ruby@perforce.com"
   t.homepage = "http://p4ruby.rubyforge.org"
   t.rubyforge_project = "p4ruby"
   t.extensions << "Rakefile"
   t.add_dependency "rake"
+  t.add_dependency "rdoc"
   t.require_paths << "ext"
 
   t.files = %w[

metadata

@@ -1,57 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: p4ruby
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 11
-  version: 1.0.11
+version: !ruby/object:Gem::Version
+  version: 2012.1Beta
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Perforce Software (ruby gem by James M. Lawrence)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby interface to the Perforce API.
-email: quixoticsycophant@gmail.com
+email: p4ruby@perforce.com
 executables: []
-
-extensions: 
+extensions:
 - Rakefile
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - README
 - CHANGES
 - Rakefile
 - install.rb
 - p4ruby.gemspec
-has_rdoc: true
 homepage: http://p4ruby.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
-- "P4Ruby: Ruby interface to the Perforce API"
+- ! 'P4Ruby: Ruby interface to the Perforce API'
 - --main
 - README
 - --exclude
@@ -62,31 +72,25 @@ rdoc_options:
 - install.rb
 - --exclude
 - p4ruby.gemspec
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: p4ruby
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the Perforce API
 test_files: []
-