php-composer 0.4.5 → 1.0.0.pre.alpha11

data/lib/composer/repository/writeable_hash_repository.rb

@@ -18,7 +18,7 @@ module Composer
     #
     # Ruby Authors:
     # Ioannis Kappas <ikappas@devworks.gr>
-    class WritableHashRepository < Composer::Repository::HashRepository
+    class WritableHashRepository < ::Composer::Repository::HashRepository
 
       def initialize(packages = [])
         super
@@ -39,15 +39,15 @@ module Composer
         packages_by_name = {}
         packages_uncanonicalized.each do |package|
           if !packages_by_name.key?(package.name) ||
-            packages_by_name[package.name].instance_of?(Composer::Package::AliasPackage)
+            packages_by_name[package.name].instance_of?(::Composer::Package::AliasPackage)
             packages_by_name[package.name] = package
           end
         end
 
         # unfold aliased packages
         results = []
-        packages_by_name.each do |name, package|
-          while package.instance_of?(Composer::Package::AliasPackage)
+        packages_by_name.each do |_name, package|
+          while package.instance_of?(::Composer::Package::AliasPackage)
             package = package.alias_of
           end
           results.push(package)
@@ -57,4 +57,4 @@ module Composer
       end
     end
   end
-end
+end

data/lib/composer/util/composer_mirror.rb

@@ -0,0 +1,76 @@
+#
+# This file was ported to ruby from Composer php source code.
+# Original Source: Composer\Repository\RepositoryInterface.php
+#
+# (c) Nils Adermann <naderman@naderman.de>
+#     Jordi Boggiano <j.boggiano@seld.be>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+#
+
+require 'digest'
+
+module Composer
+  module Util
+
+    # Composer mirror utilities
+    #
+    # @author Jordi Boggiano <j.boggiano@seld.be>
+    class ComposerMirror
+
+      class << self
+
+        def process_url(mirror_url, package_name, version, reference, type)
+
+          unless reference.nil? || /^([a-f0-9]*|%reference%)$/ =~ reference
+            reference = Digest::MD5.hexdigest(reference)
+          end
+
+          unless version.nil? || version.index('/') === nil
+            version = Digest::MD5.hexdigest(version)
+          end
+
+          map = {
+            '%package%' => package_name,
+            '%version%' => version,
+            '%reference%' => reference,
+            '%type%' => type
+          }
+
+          re = Regexp.new(map.keys.map { |x| Regexp.escape(x) }.join('|'))
+
+          mirror_url.gsub(re, map)
+        end
+
+        def process_git_url(mirror_url, package_name, url, type)
+
+          case url
+          when /^(?:(?:https?|git):\/\/github\.com\/|git@github\.com:)([^\/]+)\/(.+?)(?:\.git)?$/
+            url = "gh-#{$1}/#{$2}"
+          when /^https:\/\/bitbucket\.org\/([^\/]+)\/(.+?)(?:\.git)?\/?$/
+            url = "bb-#{$1}/#{$2}"
+          else
+            url = url.gsub(/^\//, '').gsub(/\/$/, '').gsub(/[^a-z0-9_.-]/i, '-')
+          end
+
+          map = {
+              '%package%' => package_name,
+              '%normalizedUrl%' => url,
+              '%type%' => type
+          }
+
+          re = Regexp.new(map.keys.map { |x| Regexp.escape(x) }.join('|'))
+
+          mirror_url.gsub(re, map)
+        end
+
+        def process_hg_url(mirror_url, package_name, url, type)
+          process_git_url( mirror_url, package_name, url, type)
+        end
+
+      end
+
+    end
+  end
+end

data/php-composer.gemspec

@@ -1,11 +1,12 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'composer/version'
+# -*- encoding: utf-8 -*-
+require 'rake'
+
+$:.push File.expand_path('../lib', __FILE__)
+require 'composer'
 
 Gem::Specification.new do |spec|
   spec.name             = 'php-composer'
-  spec.version          = Composer::VERSION
+  spec.version          = Composer::GEM_VERSION
   spec.authors          = ['Ioannis Kappas']
   spec.email            = ['ikappas@devworks.gr']
 
@@ -14,18 +15,23 @@ Gem::Specification.new do |spec|
   spec.homepage         = %q{http://github.com/ikappas/php-composer/tree/master}
   spec.license          = 'MIT'
 
-  spec.files            = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files            = FileList['lib/**/*.rb', 'LICENSE.txt', 'README.md']
+  spec.test_files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths    = ['lib']
 
-  spec.required_ruby_version = '>= 1.8.7'
+  spec.required_ruby_version = '>= 2.1.7'
   spec.required_rubygems_version = '>= 1.8'
 
   spec.add_runtime_dependency 'json', '~> 1.8'
   spec.add_runtime_dependency 'json-schema', '~> 2.5'
+  spec.add_runtime_dependency 'php-composer-semver', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 5.0'
+  spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rubocop', '~> 0.35', '>= 0.35.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.3', '>= 1.3.1'
+  spec.add_development_dependency 'coveralls', '~> 0.8.2'
   spec.add_development_dependency 'simplecov', '~> 0.10'
+  spec.add_development_dependency 'factory_girl', '~> 4.5.0'
 end

data/resources/composer-schema.json

@@ -136,6 +136,11 @@
           "description": "A hash of domain name => github API oauth tokens, typically {\"github.com\":\"<token>\"}.",
           "additionalProperties": true
         },
+        "gitlab-oauth": {
+          "type": "object",
+          "description": "A hash of domain name => gitlab API oauth tokens, typically {\"gitlab.com\":\"<token>\"}.",
+          "additionalProperties": true
+        },
         "http-basic": {
           "type": "object",
           "description": "A hash of domain name => {\"username\": \"...\", \"password\": \"...\"}.",
@@ -221,6 +226,13 @@
           "type": "boolean",
           "description": "Defaults to true. If set to false, the OAuth tokens created to access the github API will have a date instead of the machine hostname."
         },
+        "gitlab-domains": {
+          "type": "array",
+          "description": "A list of domains to use in gitlab mode. This is used for custom GitLab setups, defaults to [\"gitlab.com\"].",
+          "items": {
+            "type": "string"
+          }
+        },
         "archive-format": {
           "type": "string",
           "description": "The default archiving format when not provided on cli, defaults to \"tar\"."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: php-composer
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 1.0.0.pre.alpha11
 platform: ruby
 authors:
 - Ioannis Kappas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: php-composer-semver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.35.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +162,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 description: A ruby gem library for consistent interactions with php composer dependency
   manager.
 email:
@@ -123,28 +185,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rbenv-gemsets"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/composer.rb
-- lib/composer/error.rb
 - lib/composer/json/json_file.rb
 - lib/composer/json/json_formatter.rb
-- lib/composer/json/json_validaton_error.rb
+- lib/composer/json/json_validation_error.rb
 - lib/composer/package/alias_package.rb
-- lib/composer/package/base_package.rb
 - lib/composer/package/complete_package.rb
 - lib/composer/package/dumper/hash_dumper.rb
+- lib/composer/package/dumper/hash_dumper/complete_package_attribute_dumpers.rb
+- lib/composer/package/dumper/hash_dumper/package_attribute_dumpers.rb
+- lib/composer/package/dumper/hash_dumper/root_package_attribute_dumpers.rb
 - lib/composer/package/link.rb
-- lib/composer/package/link_constraint/base_constraint.rb
-- lib/composer/package/link_constraint/empty_constraint.rb
-- lib/composer/package/link_constraint/multi_constraint.rb
-- lib/composer/package/link_constraint/specific_constraint.rb
-- lib/composer/package/link_constraint/version_constraint.rb
 - lib/composer/package/loader/hash_loader.rb
+- lib/composer/package/loader/hash_loader/complete_package_attribute_loaders.rb
+- lib/composer/package/loader/hash_loader/package_attribute_loaders.rb
+- lib/composer/package/loader/hash_loader/root_package_attribute_loaders.rb
 - lib/composer/package/loader/json_loader.rb
 - lib/composer/package/package.rb
 - lib/composer/package/root_alias_package.rb
@@ -156,7 +219,7 @@ files:
 - lib/composer/repository/filesystem_repository.rb
 - lib/composer/repository/hash_repository.rb
 - lib/composer/repository/writeable_hash_repository.rb
-- lib/composer/version.rb
+- lib/composer/util/composer_mirror.rb
 - php-composer.gemspec
 - resources/composer-schema.json
 homepage: http://github.com/ikappas/php-composer/tree/master
@@ -171,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.1.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -179,8 +242,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: PHP Composer Ruby Gem
-test_files: []
+test_files:
+- ".gitignore"
+- ".rbenv-gemsets"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/composer.rb
+- lib/composer/json/json_file.rb
+- lib/composer/json/json_formatter.rb
+- lib/composer/json/json_validation_error.rb
+- lib/composer/package/alias_package.rb
+- lib/composer/package/complete_package.rb
+- lib/composer/package/dumper/hash_dumper.rb
+- lib/composer/package/dumper/hash_dumper/complete_package_attribute_dumpers.rb
+- lib/composer/package/dumper/hash_dumper/package_attribute_dumpers.rb
+- lib/composer/package/dumper/hash_dumper/root_package_attribute_dumpers.rb
+- lib/composer/package/link.rb
+- lib/composer/package/loader/hash_loader.rb
+- lib/composer/package/loader/hash_loader/complete_package_attribute_loaders.rb
+- lib/composer/package/loader/hash_loader/package_attribute_loaders.rb
+- lib/composer/package/loader/hash_loader/root_package_attribute_loaders.rb
+- lib/composer/package/loader/json_loader.rb
+- lib/composer/package/package.rb
+- lib/composer/package/root_alias_package.rb
+- lib/composer/package/root_package.rb
+- lib/composer/package/version/version_parser.rb
+- lib/composer/package/version/version_selector.rb
+- lib/composer/repository/base_repository.rb
+- lib/composer/repository/composite_repository.rb
+- lib/composer/repository/filesystem_repository.rb
+- lib/composer/repository/hash_repository.rb
+- lib/composer/repository/writeable_hash_repository.rb
+- lib/composer/util/composer_mirror.rb
+- php-composer.gemspec
+- resources/composer-schema.json

data/lib/composer/error.rb

@@ -1,8 +0,0 @@
-module Composer
-  class Error < ::StandardError; end
-  class ArgumentError < Error; end
-  class TypeError < Error; end
-  class UnexpectedValueError < Error; end
-  class LogicError < Error; end
-  class InvalidRepositoryError < Error; end
-end

data/lib/composer/package/base_package.rb

@@ -1,130 +0,0 @@
-#
-# This file was ported to ruby from Composer php source code.
-# Original Source: Composer\Package\BasePackage.php
-#
-# (c) Nils Adermann <naderman@naderman.de>
-#     Jordi Boggiano <j.boggiano@seld.be>
-#
-# For the full copyright and license information, please view the LICENSE
-# file that was distributed with this source code.
-#
-
-module Composer
-  module Package
-
-    # Base class for packages providing name storage
-    # and default match implementation
-    # @php_author Nils Adermann <naderman@naderman.de>
-    # @author Ioannis Kappas <ikappas@devworks.gr>
-    class BasePackage
-
-      # base package attributes
-      attr_accessor :id, :repository, :transport_options
-      attr_reader :name, :pretty_name, :version, :pretty_version, :stability
-
-      STABILITY_STABLE  = 0
-      STABILITY_RC      = 5
-      STABILITY_BETA    = 10
-      STABILITY_ALPHA   = 15
-      STABILITY_DEV     = 20
-
-      SUPPORTED_LINK_TYPES = {
-        'require' => {
-          'description' => 'requires',
-          'method' => 'requires'
-        },
-        'conflict' => {
-          'description' => 'conflicts',
-          'method' => 'conflicts'
-        },
-        'provide' => {
-          'description' => 'provides',
-          'method' => 'provides'
-        },
-        'replace' => {
-          'description' => 'replaces',
-          'method' => 'replaces'
-        },
-        'require-dev' => {
-          'description' => 'requires (for development)',
-          'method' => 'dev_requires'
-        }
-      }.freeze()
-
-      class << self
-
-        def stabilities
-          @stabilities ||= {
-            'stable' => STABILITY_STABLE,
-            'RC'     => STABILITY_RC,
-            'beta'   => STABILITY_BETA,
-            'alpha'  => STABILITY_ALPHA,
-            'dev'    => STABILITY_DEV,
-          }.freeze()
-        end
-
-      end
-
-      # Creates a new in memory package.
-      # Param: string name           The package's name
-      # Param: string version        The package's version
-      # Param: string pretty_version The package's non-normalized version
-      def initialize(name)
-        @pretty_name = name
-        @name = name.downcase
-        @id = -1
-        @transport_options = []
-      end
-
-      def attributes
-        dumper = Composer::Package::Dumper::HashDumper.new
-        dumper.dump(self)
-      end
-
-      # Set package type
-      # Param: string type
-      def type=(type)
-        @type = type
-      end
-
-      # Get package type
-      # Return: string
-      def type
-        @type ? @type : 'library'
-      end
-
-      # Set package repository
-      def repository=(repository)
-        if (@repository && repository != @repository)
-          raise LogicError, 'A package can only be added to one repository'
-        end
-        @repository = repository
-      end
-
-      # Get package repository
-      def repository
-        @repository
-      end
-
-      # def is_platform?
-      #   @repository && @repository.instance_of?(PlatformRepository)
-      # end
-
-      # Returns package unique name, constructed from name, version and
-      # release type.
-      # Return: string
-      def unique_name
-        "#{name}-#{version}"
-      end
-
-      def pretty_string
-        "#{pretty_name} #{pretty_version}"
-      end
-
-      def to_s
-        unique_name
-      end
-
-    end
-  end
-end