php-composer 0.4.5 → 1.0.0.pre.alpha11

data/lib/composer/json/json_formatter.rb

@@ -1,6 +1,8 @@
 #
 # This file was ported to ruby from Composer php source code file.
+#
 # Original Source: Composer\Json\JsonFormatter.php
+# Ref SHA: ce085826711a6354024203c6530ee0b56fea9c13
 #
 # (c) Nils Adermann <naderman@naderman.de>
 #     Jordi Boggiano <j.boggiano@seld.be>
@@ -9,18 +11,9 @@
 # file that was distributed with this source code.
 #
 
-# JSON_HEX_TAG => 1
-# JSON_HEX_AMP => 2
-# JSON_HEX_APOS => 4
-# JSON_HEX_QUOT => 8
-# JSON_FORCE_OBJECT => 16
-# JSON_NUMERIC_CHECK => 32
-# JSON_UNESCAPED_SLASHES => 64
-# JSON_PRETTY_PRINT => 128
-# JSON_UNESCAPED_UNICODE => 256
-
 module Composer
   module Json
+
     #  * Formats json strings used for php < 5.4 because the json_encode doesn't
     #  * supports the flags JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE
     #  * in these versions
@@ -33,27 +26,18 @@ module Composer
     # Ioannis Kappas <ikappas@devworks.gr>
     class JsonFormatter
 
-      JSON_HEX_TAG = 1
-      JSON_HEX_AMP = 2
-      JSON_HEX_APOS = 4
-      JSON_HEX_QUOT = 8
-      JSON_FORCE_OBJECT = 16
-      JSON_NUMERIC_CHECK = 32
-      JSON_UNESCAPED_SLASHES = 64
-      JSON_PRETTY_PRINT = 128
-      JSON_UNESCAPED_UNICODE = 256
-
       class << self
+
         # This code is based on the function found at:
         # http://recursive-design.com/blog/2008/03/11/format-json-with-php/
         #
         # Originally licensed under MIT by Dave Perrett <mail@recursive-design.com>
         #
         # @param json string
-        # @param unescape_unicode bool Un escape unicode
-        # @param unescape_slashes bool  Un escape slashes
+        # @param unescape_unicode bool Whether to unescape unicode
+        # @param unescape_slashes bool  Whether to unescape slashes
         # @return string
-        def format(json, options)
+        def format(json, unescape_unicode, unescape_slashes)
 
           result = ''
           pos = 0
@@ -63,14 +47,14 @@ module Composer
           out_of_quotes = true
           buffer = ''
           no_escape = true
-
+          
           for i in 0..(str_len - 1)
 
-            # Grab the next character in the string
+            # grab the next character in the string
             char = json[i]
 
-            # Are we inside a quoted string?
-            if '"' === char && no_escape
+            # are we inside a quoted string?
+            if char === '"' && no_escape
               out_of_quotes = !out_of_quotes
             end
 
@@ -78,79 +62,61 @@ module Composer
               buffer << char
               no_escape = '\\' === char ? !no_escape : true
               next
-            elsif buffer != ''
-              if options & JSON_HEX_TAG === JSON_HEX_TAG
-                buffer.gsub!('<', '\\u003C')
-                buffer.gsub!('>', '\\u003E')
-              end
-              if options & JSON_HEX_AMP === JSON_HEX_AMP
-                buffer.gsub!('&', '\\u0026')
-              end
-              if options & JSON_HEX_APOS === JSON_HEX_APOS
-                buffer.gsub!('\'', '\\u0027')
-              end
-              if options & JSON_HEX_QUOT === JSON_HEX_QUOT
-                buffer.gsub!('\"', '\\u0022')
-              end
-              if options & JSON_UNESCAPED_SLASHES === JSON_UNESCAPED_SLASHES
+
+            elsif !buffer.empty?
+
+              if unescape_slashes
                 buffer.gsub!('\\/', '/')
               end
-              if options & JSON_UNESCAPED_UNICODE === JSON_UNESCAPED_UNICODE
+
+              if unescape_unicode
                 buffer.gsub!(/\\u([\da-fA-F]{4})/) {|m| [$1].pack('H*').unpack('n*').pack('U*')}
               end
 
               result << buffer + char
               buffer = ''
               next
+
             end
 
-            if options & JSON_PRETTY_PRINT === JSON_PRETTY_PRINT
-              if char === ':'
+            if char === ':'
               # Add a space after the : character
               char << ' '
-              elsif char === '}' || char === ']'
-                pos -= 1
-                prev_char = json[i - 1] #substr(json, i - 1, 1)
-
-                if prev_char != '{' &&  prev_char != '['
-                  # If this character is the end of an element,
-                  # output a new line and indent the next line
-                  result << new_line
-
-                  for j in 0..(pos - 1)
-                    result << indent_str
-                  end
-                else
-                  # Collapse empty {} and []
-                  result.rstrip!
-                end
-              end
-            end
 
-            result << char
+            elsif char === '}' || char === ']'
+
+              pos -= 1
+              prev_char = json[i - 1]
 
-            if options & JSON_PRETTY_PRINT === JSON_PRETTY_PRINT
-              # If the last character was the beginning of an element,
-              # output a new line and indent the next line
-              if char === ',' || char === '{' || char === '['
+              if prev_char != '{' && prev_char != '['
+                # If this character is the end of an element,
+                # output a new line and indent the next line
                 result << new_line
-                pos += 1 if char === '{' || char === '['
+
                 for j in 0..(pos - 1)
                   result << indent_str
                 end
+              else
+                # Collapse empty {} and []
+                result.rstrip!
               end
             end
-          end
 
-          result
-        end
+            result << char
 
-        def unescape_slashes(s)
-          s.gsub('\\/', '/')
-        end
+            # If the last character was the beginning of an element,
+            # output a new line and indent the next line
+            if char === ',' || char === '{' || char === '['
+              result << new_line
+              pos += 1 if char === '{' || char === '['
+              for j in 0..(pos - 1)
+                result << indent_str
+              end
+            end
 
-        def unescape_unicode(s)
-          s.gsub(/\\u([\da-fA-F]{4})/) {|m| [$1].pack('H*').unpack('n*').pack('U*')}
+          end
+
+          result
         end
 
       end

data/lib/composer/json/{json_validaton_error.rb → json_validation_error.rb}

@@ -1,6 +1,8 @@
 #
 # This file was ported to ruby from Composer php source code file.
+#
 # Original Source: Composer\Json\JsonValidationException.php
+# Ref SHA: 16578d1d01656ce7b694abd5517af44395cc53b3
 #
 # (c) Nils Adermann <naderman@naderman.de>
 #     Jordi Boggiano <j.boggiano@seld.be>
@@ -11,6 +13,7 @@
 
 module Composer
   module Json
+
     # Represents a Json Validation error
     #
     # PHP Authors:
@@ -18,12 +21,13 @@ module Composer
     #
     # Ruby Authors:
     # Ioannis Kappas <ikappas@devworks.gr>
-    class JsonValidationError < StandardError
+    class JsonValidationError < ::Composer::Error
       attr_reader :errors
 
       def initialize(errors)
         @errors = errors
       end
     end
+
   end
-end
+end

data/lib/composer/package/alias_package.rb

@@ -9,6 +9,8 @@
 # file that was distributed with this source code.
 #
 
+require 'composer/semver'
+
 module Composer
   module Package
 
@@ -16,84 +18,53 @@ module Composer
     # and contains additional metadata
     # @php_author Jordi Boggiano <j.boggiano@seld.be>
     # @author Ioannis Kappas <ikappas@devworks.gr>
-    class AliasPackage < Composer::Package::BasePackage
+    class AliasPackage < ::Composer::Package::CompletePackage
 
-      attr_reader :alias_of, :requires, :conflicts, :provides, :replaces
-                  :dev_requires
+      attr_reader :alias_of, :requires, :conflicts, :provides, :replaces, :dev_requires
 
-      attr_accessor :repositories, :license, :keywords, :authors,
-                    :description, :homepage, :scripts, :support,
-                    :source_url, :source_reference, :source_mirrors
+      # attr_accessor :repositories, :license, :keywords, :authors,
+      #               :description, :homepage, :scripts, :support,
+      #               :source_url, :source_reference, :source_mirrors
 
-      # All descendants' constructors should call this parent constructor
-      # @param alias_of Package The package this package is an alias of
-      # @param version String The version the alias must report
-      # @param pretty_version String The alias's non-normalized version
+      # All descendants' constructors should call this parent constructor.
+      #
+      # Params:
+      # +alias_of+:: the package this package is an alias of
+      # +version+:: the version the alias must report
+      # +pretty_version+:: the alias's non-normalized version
       def initialize(alias_of, version, pretty_version)
-        super(alias_of.name)
+
+        unless alias_of.kind_of?(::Composer::Package::Package)
+          raise ::Composer::ArgumentError,
+                'Invalid alias_of argument supplied.'
+        end
+
+        super(alias_of.name, version, pretty_version)
 
         @version = version
         @pretty_version = pretty_version
         @alias_of = alias_of
-        @stability = Composer::Package::Version::VersionParser::parse_stability(version)
+        @stability = ::Composer::Semver::VersionParser::parse_stability(version)
         @dev = @stability === 'dev'
 
         # replace self.version dependencies
-        %w{requires dev_requires}.each do |type|
-
-          links = alias_of.send(type)
-          links.each do |index, link|
-            # link is self.version, but must be replacing also the replaced version
-            if 'self.version' === link.pretty_constraint
-              links[index] = Composer::Package::Link.new(
-                link.source,
-                link.target,
-                Composer::Package::LinkConstraint::VersionConstraint.new(
-                  '=',
-                  @version
-                ),
-                type,
-                pretty_version
-              )
-            end
-          end
-          @type = links
+        %w{requires dev_requires conflicts provides replaces}.each do |type|
+          links = alias_of.send type
+          @type = replace_self_version_dependencies links, type
         end
-
-        # duplicate self.version provides
-        %w{conflicts provides replaces}.each do |type|
-          links = alias_of.send(type)
-          new_links = []
-          links.each do |link|
-            # link is self.version, but must be replacing also the replaced version
-            if 'self.version' === link.pretty_constraint
-              new_links = Composer.Package.Link.new(
-                link.source,
-                link.target,
-                Composer::Package::LinkConstraint.VersionConstraint.new(
-                  '=',
-                  @version
-                ),
-                type,
-                pretty_version
-              )
-            end
-          end
-          @type = links.zip(new_links).flatten.compact
-          # @type = (links << new_links)
-        end
-
       end
 
       # Determine if development package
       # Return: true if development package; Otherwise false.
-      def is_dev
+      def is_dev?
         @dev
       end
 
       # Stores whether this is an alias created by an aliasing in the requirements of the root package or not
       # Use by the policy for sorting manually aliased packages first, see #576
-      # @param bool $value
+      #
+      # Params:
+      # +value+:: bool $value
       # @return mixed
       def root_package_alias=(value)
         @root_package_alias = value
@@ -110,7 +81,7 @@ module Composer
       #######################################
 
       def type
-        @alias_of.Type
+        @alias_of.type
       end
 
       def target_dir
@@ -154,7 +125,7 @@ module Composer
       end
 
       def source_mirrors
-        @alias_of.SourceMirrors
+        @alias_of.source_mirrors
       end
 
       def dist_type
@@ -261,13 +232,58 @@ module Composer
         @alias_of.archive_excludes
       end
 
-      def is_abandoned?
-        @alias_of.is_abandoned?
+      def abandoned?
+        @alias_of.abandoned?
       end
 
       def replacement_package
         @alias_of.replacement_package
       end
+
+      protected
+
+      ##
+      # Replace self version dependencies helper
+      #
+      # @param links array
+      #   An array of links
+      # @param link_type
+      #   The specified links type
+      #
+      # @return array
+      ##
+      def replace_self_version_dependencies(links, link_type)
+        if %w{conflicts provides replaces}.include? link_type
+          new_links = []
+          links.each do |link|
+            # link is self.version, but must be replacing also the replaced version
+            if 'self.version' === link.pretty_constraint
+              new_links = ::Composer.Package.Link.new(
+                link.source,
+                link.target,
+                ::Composer::Semver::Constraint::Constraint.new('=', @version),
+                type,
+                pretty_version
+              )
+            end
+          end
+          links = links.zip(new_links).flatten.compact
+        else
+          links.each do |index, link|
+            # link is self.version, but must be replacing also the replaced version
+            if 'self.version' === link.pretty_constraint
+              links[index] = ::Composer::Package::Link.new(
+                link.source,
+                link.target,
+                ::Composer::Semver::Constraint::Constraint.new('=', @version),
+                type,
+                pretty_version
+              )
+            end
+          end
+        end
+        links
+      end
     end
   end
 end

data/lib/composer/package/complete_package.rb

@@ -12,42 +12,112 @@
 module Composer
   module Package
 
-    # Package containing additional metadata that is not used by the solver
-    class CompletePackage < Composer::Package::Package
+    # Represents a package containing additional metadata that is not used by the solver.
+    class CompletePackage < ::Composer::Package::Package
 
-      attr_accessor :scripts, :repositories, :license, :keywords, :authors,
-                    :description, :homepage, :support
-
-      # Creates a new in memory package.
-      # Param: string name          The package's name
-      # Param: string version       The package's version
-      # Param: string prettyVersion The package's non-normalized version
+      # Creates a new in memory complete package.
+      #
+      # Params:
+      # +name+:: The package's name.
+      # +version+:: The package's version.
+      # +pretty_version+:: The package's non-normalized version.
       def initialize(name, version, pretty_version)
         super(name, version, pretty_version)
-
-        @license = []
         @scripts = []
+        @repositories = nil
+        @license = []
+        @keywords = nil
+        @authors = nil
+        @description = nil
+        @homepage = nil
         @support = []
         @abandoned = false
       end
 
-      # Determine if package is abandoned
-      # Return: true if package is abandoned; Otherwise false.
-      def is_abandoned?
-        @abandoned
+      attr_writer :scripts
+
+      # Returns the scripts of this package
+      # @return array array('script name' => array('listeners'))
+      attr_reader :scripts
+
+      # Set the repositories
+      # @param repositories array
+      attr_writer :repositories
+
+      # Returns an array of repositories
+      #
+      # {"<type>": {<config key/values>}}
+      #
+      # @return array Repositories
+      attr_reader :repositories
+
+      # Set the license
+      # @param license array
+      attr_writer :license
+
+      # Returns the package license, e.g. MIT, BSD, GPL
+      # @return array The package licenses
+      attr_reader :license
+
+      # Set the keywords
+      # @param keywords array
+      attr_writer :keywords
+
+      # Returns an array of keywords relating to the package
+      # @return array
+      attr_reader :keywords
+
+      # Set the authors
+      # @param authors array
+      attr_writer :authors
+
+      # Returns an array of authors of the package
+      # Each item can contain name/homepage/email keys
+      #
+      # @return array
+      attr_reader :authors
+
+      # Set the description
+      # @param description string
+      attr_writer :description
+
+      # Returns the package description
+      # @return string
+      attr_reader :description
+
+      # Set the homepage
+      # @param homepage string
+      attr_writer :homepage
+
+      # Returns the package homepage
+      # @return string
+      attr_reader :homepage
+
+      # Set the support information
+      # @param support array
+      attr_writer :support
+
+      # Returns the support information
+      # @return array
+      attr_reader :support
+
+      # Determine whether the package is abandoned.
+      # @return bool true if package is abandoned; Otherwise false.
+      def abandoned?
+        @abandoned.kind_of?(String) ? true : @abandoned === true
       end
 
       # Set abandoned
-      # Param boolean|string $abandoned
+      # @param abandoned bool
       def abandoned=(abandoned)
         @abandoned = abandoned
       end
 
       # If the package is abandoned and has a suggested replacement,
-      # this method returns it
+      # this method returns it.
       # @return string|nil
       def replacement_package
-        return @abandoned.kind_of?(String) ? @abandoned : nil
+        @abandoned.kind_of?(String) ? @abandoned : nil
       end
 
     end