origen 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b636bd97c227eecf2344ccbdc17e29712953325
-  data.tar.gz: cd69d451f85313509d2a2c4a31887cbf81fb57c2
+  metadata.gz: bf76087ad1eed645f45fe797f3b5561d216a9712
+  data.tar.gz: fc8ad3b72821063fed4bbbc43f8c822df4c6a578
 SHA512:
-  metadata.gz: 4e104a65bd531b7e52ec7f9f74d002b822d004fb0c46556e412392c3b874101a8be06c27fd83bb05e35acad5fa3b2c62251d9ba729a5de08dc472004ffd11b57
-  data.tar.gz: dc29b4f3a4567780af525fc9b023bae374af3d71ed96f241e294ae35aba9d241009f4496d4c7f25c112dca0a8d3978b3f6223b378488b8dc967bbabff6501af6
+  metadata.gz: 22f0891066cbaafd8a7b712a794a095baded766e57536fa477bb7bdffcde3865a8f198bab18c9605fbdc1da49b29e10073160d5ab9fa7efbbe0af5773facbe0b
+  data.tar.gz: 954ae5c524084789ad30658011ca7c3d7f796053e3b745ba32dfd85614482b3cccdf5071be411b8bbe3bb4d5ec12d41b0aab48b7f9bfb38b3ea8d22e5e283510

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 32
-  BUGFIX = 0
+  BUGFIX = 1
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/revision_control/perforce.rb

@@ -1,109 +1,18 @@
-require 'P4'
 module Origen
   module RevisionControl
     class Perforce < Base
-      # P4 session
-      attr_reader :p4
-
-      # e.g. myfile.txt
-      attr_accessor :remote_file
-
       def initialize(options = {})
         super
-        @remotes_method = :print
-        @p4 = P4.new
-        @p4.maxresults = 1
-        parse_remote
-        @p4.connect
-        unless @p4.connected?
-          Origen.log.error("Could not connect to port #{@p4.port} on client #{@p4.client}!")
-          fail
-        end
-        @p4.run_login
-      end
-
-      # Downloads a file to a local directory, no workspace/client is created.  Perfect
-      # for read-only access like an application remote
-      def print(options = {})
-        options = {
-          verbose: true,
-          version: 'Latest'
-        }.merge(options)
-        cmd = [__method__.to_s, '-o', "#{@local}/#{@remote_file.to_s.split('/')[-1]}", @remote_file.to_s]
-        run cmd
-      end
-
-      def checkout(path = nil, options = {})
-        not_yet_supported(__method__)
-      end
-
-      def root
-        not_yet_supported(__method__)
-      end
-
-      def current_branch
-        not_yet_supported(__method__)
-      end
-
-      def diff_cmd
-        not_yet_supported(__method__)
-      end
-
-      def unmanaged
-        not_yet_supported(__method__)
-      end
-
-      def local_modifications
-        not_yet_supported(__method__)
-      end
-
-      def changes
-        not_yet_supported(__method__)
-      end
-
-      def checkin
-        not_yet_supported(__method__)
-      end
-
-      def build
-        not_yet_supported(__method__)
-      end
-
-      private
-
-      # Needs to be in the form of an Array with command, as a Sting, as the first argument
-      # e.g. ["print", "-o", "pins/myfile.txt", "//depot/myprod/main/doc/pinout/myfile.txt"]
-      def run(cmd)
-        p4.run cmd
-      end
-
-      def not_yet_supported(m)
-        Origen.log.warn("The method #{m} is not currently supported by the Perforce API")
-        nil
-      end
-
-      def parse_remote
-        (@p4.port, @remote_file) = @remote.to_s.match(/^p4\:\/\/(\S+\:\d+)(.*)/).captures unless @remote.nil?
-      end
-
-      def configure_client(options)
-        unless options.include? :local
-          Origen.log.error('Need options[:local] to know how to configure the Perforce client!')
-          fail
-        end
-        client_name = "#{Origen.app.name}_#{User.current.id}_#{Time.now.to_i}"
         begin
-          client_spec = @p4.fetch_client
-          client_spec['Root'] = options[:local].to_s
-          client_spec['Client'] = client_name
-          client_spec['View'] = ["#{@remote_file} //#{client_name}/#{@remote_file.split('/')[-1]}"]
-          client_spec['Host'] = nil
-          @p4.save_client(client_spec)
-          @p4.client = client_name
-        rescue P4Exception
-          @p4.errors.each { |e| Origen.log.error e }
-          raise
+          require 'origen_perforce'
+        rescue LoadError
+          puts 'To use the Perforce revision control system with Origen, you must add the following gem to your Gemfile:'
+          puts
+          puts "  gem 'origen_perforce'"
+          puts
+          exit 1
         end
+        _initialize_(options)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -352,26 +352,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: p4ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2015.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2015.2.1313860
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2015.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2015.2.1313860
 description: 
 email:
 - stephen.f.mcginty@gmail.com