nexus_cli 2.0.2 → 3.0.0

data/VERSION

@@ -1 +1 @@
-2.0.2
+3.0.0

data/lib/nexus_cli/connection.rb

@@ -44,14 +44,14 @@ module NexusCli
       response = nexus.get(nexus_url("service/local/status"))
       case response.status
       when 200
-        doc = Nokogiri::XML(response.content).xpath("/status/data")
+        doc = REXML::Document.new(response.content).elements["/status/data"]
         data = Hash.new
-        data['app_name'] = doc.xpath("appName")[0].text
-        data['version'] = doc.xpath("version")[0].text
-        data['edition_long'] = doc.xpath("editionLong")[0].text
-        data['state'] = doc.xpath("state")[0].text
-        data['started_at'] = doc.xpath("startedAt")[0].text
-        data['base_url'] = doc.xpath("baseUrl")[0].text
+        data['app_name'] = doc.elements["appName"].text
+        data['version'] = doc.elements["version"].text
+        data['edition_long'] = doc.elements["editionLong"].text
+        data['state'] = doc.elements["state"].text
+        data['started_at'] = doc.elements["startedAt"].text
+        data['base_url'] = doc.elements["baseUrl"].text
         return data
       when 401
         raise PermissionsException

data/lib/nexus_cli/mixins/artifact_actions.rb

@@ -14,7 +14,8 @@ module NexusCli
     # @return [Hash] Some information about the artifact that was pulled.
     def pull_artifact(artifact, destination=nil)
       group_id, artifact_id, version, extension = parse_artifact_string(artifact)
-      version = Nokogiri::XML(get_artifact_info(artifact)).xpath("//version").first.content() if version.casecmp("latest")
+      version = REXML::Document.new(get_artifact_info(artifact)).elements["//version"].text if version.casecmp("latest")
+
       file_name = "#{artifact_id}-#{version}.#{extension}"
       destination = File.join(File.expand_path(destination || "."), file_name)
       response = nexus.get(nexus_url("service/local/artifact/maven/redirect"), :query => {:g => group_id, :a => artifact_id, :v => version, :e => extension, :r => configuration['repository']})
@@ -123,7 +124,7 @@ module NexusCli
       response = nexus.get(nexus_url("service/local/data_index"), :query => {:g => group_id, :a => artifact_id})
       case response.status
       when 200
-        doc = Nokogiri::XML(response.content)
+        doc = REXML::Document.new(response.content)
         return format_search_results(doc, group_id, artifact_id)
       else
         raise UnexpectedStatusCodeException.new(response.status)
@@ -139,13 +140,15 @@ module NexusCli
     # Formats the given XML into an [Array<String>] so it
     # can be displayed nicely.
     # 
-    # @param  doc [Nokogiri::XML] the xml search results
+    # @param  doc [REXML::Document] the xml search results
     # @param  group_id [String] the group id
     # @param  artifact_id [String] the artifact id
     # 
     # @return [type] [description]
     def format_search_results(doc, group_id, artifact_id)
-      versions = doc.xpath("//version").inject([]) {|array,node| array << "#{node.content()}"}
+      
+      versions = []
+      REXML::XPath.each(doc, "//version") { |matched_version| versions << matched_version.text }
       if versions.length > 0
         indent_size = versions.max{|a,b| a.length <=> b.length}.size+4
         formated_results = ['Found Versions:']

data/lib/nexus_cli/mixins/pro/custom_metadata_actions.rb

@@ -66,7 +66,7 @@ module NexusCli
         response = nexus.get(nexus_url("service/local/search/m2/freeform"), :query => {:p => param[0], :t => param[1], :v => param[2]})
         case response.status
         when 200
-          nodesets.push(Nokogiri::XML(response.body).xpath("/search-results/data"))
+          nodesets.push(REXML::Document.new(response.body).elements["/search-results/data"])
         when 400
           raise BadSearchRequestException
         when 404
@@ -77,7 +77,9 @@ module NexusCli
       end
       # Perform array intersection across all NodeSets for the final common set.
       result = nodesets.inject(nodesets.first) {|memo, nodeset| get_common_artifact_set(memo, nodeset)}
-      return result.nil? ? "" : result.to_xml(:indent => 4)
+      formatter = REXML::Formatters::Pretty.new(4)
+      formatter.compact = true
+      return result.nil? ? "" : formatter.write(result, "")
     end
 
     private
@@ -147,22 +149,27 @@ module NexusCli
     end
 
     # Gets the intersection of two artifact arrays, returning the common set
-    # @param [Array] set1, set2 The two Nokogiri::NodeSet objects to intersect
-    # @result [Nokogiri::NodeSet] The resulting object generated from the array intersect
-    def get_common_artifact_set(set1, set2)
-      intersection = get_artifact_array(set1) & get_artifact_array(set2)
-      return intersection.count > 0 ? Nokogiri::XML("<data>#{intersection.join}</data>").root : Nokogiri::XML("").root
+    #
+    # @param [REXML::Document] left_document, right_document 
+    #   The two REXML::Document objects to intersect
+    #
+    # @result [REXML::Document nil] 
+    #   The resulting object generated from the intersectection or nil
+    def get_common_artifact_set(left_document, right_document)
+      intersection = get_artifact_array(left_document) & get_artifact_array(right_document)
+      return intersection.count > 0 ? REXML::Document.new("<data>#{intersection.join}</data>").root : nil
     end
 
     # Collect <artifact> elements into an array
+    # 
     # @info This will allow use of array intersection to find common artifacts in searches
-    # @param [Nokogiri::NodeSet] set The object to be divided by <artifact> elements
+    # 
+    # @param [REXML::Document] document The object to be divided by <artifact> elements
+    # 
     # @result [Array] The result array of artifact elements
-    def get_artifact_array(set)
-      set.search("//artifact").inject([]) do |artifacts, artifact|
-        artifacts.push(artifact.to_s)
-        artifacts
-      end
+    def get_artifact_array(document)
+      artifacts = []
+      REXML::XPath.each(document, "//artifact") { |matched_artifact| artifacts << matched_artifact.text }
     end
   end
 end

data/lib/nexus_cli/mixins/pro/smart_proxy_actions.rb

@@ -47,7 +47,7 @@ module NexusCli
     # 
     # @return [Boolean] true if the repository is now subscribing, false otherwise
     def enable_artifact_subscribe(repository_id, preemptive_fetch)
-      raise NotProxyRepositoryException.new(repository_id) unless Nokogiri::XML(get_repository_info(repository_id)).xpath("/repository/data/repoType").first.content == "proxy"
+      raise NotProxyRepositoryException.new(repository_id) unless is_proxy_repository?(get_repository_info(repository_id))
 
       params = {:repositoryId => repository_id}
       params[:subscribe] = true
@@ -61,7 +61,7 @@ module NexusCli
     # 
     # @return [Boolean] true if the repository is disabled, false otherwise
     def disable_artifact_subscribe(repository_id)
-      raise NotProxyRepositoryException.new(repository_id) unless Nokogiri::XML(get_repository_info(repository_id)).xpath("/repository/data/repoType").first.content == "proxy"
+      raise NotProxyRepositoryException.new(repository_id) unless is_proxy_repository?(get_repository_info(repository_id))
 
       params = {:repositoryId => repository_id}
       params[:subscribe] = false
@@ -210,5 +210,10 @@ module NexusCli
         raise UnexpectedStatusCodeException.new(response.status)
       end
     end
+
+    private
+      def is_proxy_repository?(repository_xml)
+        REXML::Document.new(repository_xml).elements["/repository/data/repoType"].text == "proxy"
+      end
   end
 end

data/lib/nexus_cli/n3_metadata.rb

@@ -1,4 +1,3 @@
-require 'nokogiri'
 require 'base64'
 
 module NexusCli
@@ -29,19 +28,26 @@ module NexusCli
       # Parses the regular custom metadata xml into a simpler format containing only the custom metadata.
       def convert_result_to_simple_xml(custom_metadata)
         request = []
-        Nokogiri::XML(custom_metadata).root.search("//customMetadataResponse/data/customMetadata[namespace=\"urn:nexus/user#\"]").each do |row|
-          request.push(create_tag(row.at("key").text.strip, row.at("value").text.strip))
+        document = REXML::Document.new(custom_metadata)
+        REXML::XPath.each(document, "//customMetadataResponse/data/customMetadata[namespace=\"urn:nexus/user#\"]") do |row|
+          request.push(create_tag(row.elements["key"].text.strip, row.elements["value"].text.strip))
         end
-        return Nokogiri::XML("<artifact-resolution><data>#{request.join}</data></artifact-resolution>").root.to_xml(:indent => 4)
+        formatter = REXML::Formatters::Pretty.new(4)
+        formatter.compact = true
+        document = REXML::Document.new("<artifact-resolution><data>#{request.join}</data></artifact-resolution>")
+        out = ""
+        formatter.write(document, out)
+        out
       end
 
       # Parses the regular custom metadata xml into a hash containing only the custom metadata.
       def convert_result_to_hash(custom_metadata)
         request = {}
-        Nokogiri::XML(custom_metadata).root.search("//customMetadataResponse/data/customMetadata[namespace=\"urn:nexus/user#\"]").each do |row|
-          request[row.at("key").text.strip] = row.at("value").text.strip
+        document = REXML::Document.new(custom_metadata)
+        REXML::XPath.each(document, "//customMetadataResponse/data/customMetadata[namespace=\"urn:nexus/user#\"]") do |row|
+          request[row.elements["key"].text.strip] = row.elements["value"].text.strip
         end
-        return request
+        request
       end
 
       # Create the request from the specified list of custom metadata key:value pairs
@@ -64,7 +70,7 @@ module NexusCli
       private
 
       def create_tag(tag, value)
-        return "<#{tag}>#{value}</#{tag}>"
+        "<#{tag}>#{value}</#{tag}>"
       end
     end
   end

data/lib/nexus_cli/remote_factory.rb

@@ -1,5 +1,4 @@
 require 'httpclient'
-require 'nokogiri'
 require 'yaml'
 
 module NexusCli

data/lib/nexus_cli.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'httpclient'
 require 'nexus_cli/errors'
-require 'nokogiri'
+require 'rexml/document'
 require 'yaml'
 
 module NexusCli

data/nexus_cli.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'thor'
   s.add_dependency 'httpclient', '= 2.2.5'
-  s.add_dependency 'nokogiri'
   s.add_dependency 'extlib'
   s.add_dependency 'json'
   s.add_dependency 'highline'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,22 +43,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.5
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4038582514011426176
+      hash: 1427229917539912472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,10 +259,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4038582514011426176
+      hash: 1427229917539912472
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A command-line wrapper for making REST calls to Sonatype Nexus.