polisher 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccecc84da6d0524db953260dc592ee5424f33b0
-  data.tar.gz: c9dc301daf1b9366e5d62eb68615b9b53004d6a8
+  metadata.gz: cde437d4b30595528a08d2127ed32d64458b9910
+  data.tar.gz: 2124dcabfc9cfda82bc6a481163e17e0ef0e6774
 SHA512:
-  metadata.gz: bd10517253ce3ddf2c69a0169d720d52031dc61586078f7598bbd25909057f73aa0b96c4f7610ef996458bc1303b9c2d21381a7a08d338f5a85c7c9a07f5f7fb
-  data.tar.gz: eea79b07d89a0966245a48654967bb49be12e6df13da1c1c15ba1b4c283ca2d85812a46be3d5f6f41bb00e75f83dd72c2b34cee107016744689323f25cbf25a6
+  metadata.gz: 46ed5242624caa97426ee83c6b37a21f14253ceab0ccaa026e2154c8936d9594e79c0383cfdb409ddc6a045129a62154b7ee5c695178ac402a9562b858644292
+  data.tar.gz: 029682eb264075bf04c12a8922bc58a3da54622d48bdac446501c87e58b9fe70a87e2ad3bb798c15f2b82a4b8278054e9bc65174b41c0497c078113a4b4184c6

data/bin/binary_gem_resolver.rb

@@ -50,7 +50,7 @@ end
 require 'mkmf'
 
 alias :_cpp_command :cpp_command
-def cpp_command(outfile="", opt)
+def cpp_command(outfile, opt="")
   ""
 end
 

data/bin/gem_dependency_checker.rb

@@ -18,13 +18,13 @@ require 'optparse'
 require 'colored'
 require 'polisher/gem'
 require 'polisher/gemfile'
-require 'polisher/gemspec'
 
 ##########################################################
 
 conf = { :gemfile             => './Gemfile',
          :gemspec             => nil,
          :gemname             => nil,
+         :groups              =>  [],
          :devel_deps          => false,
          :highlight_missing   => false,
          :check_fedora        => false,
@@ -46,6 +46,10 @@ optparse = OptionParser.new do |opts|
     conf[:gemfile] = g
   end
 
+  opts.on('--group gemfile_groups', 'Gemfile groups (may be specified multiple times)') do |g|
+    conf[:groups] << g
+  end
+
   opts.on('--gemspec file', 'Location of the gemspec to parse') do |g|
     conf[:gemspec] = g
   end
@@ -145,11 +149,17 @@ if conf[:gemname]
     print_dep(tgt, dep, versions)
   end
 
+elsif conf[:gemspec]
+  gem = Polisher::Gem.from_gemspec(conf[:gemspec])
+  gem.versions(:recursive => true, :dev_deps => true) do |tgt, dep, versions|
+    print_dep(tgt, dep, versions)
+  end
+
 elsif conf[:gemfile]
   gemfile = nil
 
   begin
-    gemfile = Polisher::Gemfile.parse(conf[:gemfile])
+    gemfile = Polisher::Gemfile.parse(conf[:gemfile], :groups => conf[:groups])
   rescue => e
     puts "Runtime err #{e}".red
     exit 1
@@ -158,10 +168,4 @@ elsif conf[:gemfile]
   gemfile.dependency_versions do |tgt, dep, versions|
     print_dep(tgt, dep, versions)
   end
-
-elsif conf[:gemspec]
-  gemspec = Polisher::Gemspec.parse(conf[:gemspec])
-  gemspec.dependency_versions do |tgt, dep, versions|
-    print_dep(tgt, dep, versions)
-  end
 end

data/bin/git_gem_updater.rb

@@ -61,26 +61,27 @@ Dir.chdir conf[:dir]
 conf[:gems].each do |gem_name|
   pkg =
     begin
-      Polisher::GitPackage.new(:name => gem_name).clone
+      Polisher::Git::Pkg.new(:name => gem_name).clone
     rescue => e
+      puts "Problem Cloning Package, Skipping: #{e}"
       next
     end
 
   gem = Polisher::Gem.retrieve gem_name
-  File.write("#{gem.name}-#{gem.version}.gem", gem.download_gem)
   pkg.update_to(gem)
   # TODO append gem dependencies to conf[:gems] list
 
   pkg.build
 
   unless pkg.spec.has_check?
-    puts "Warning: no %check section in spec,\
-          manually verify functionality!".bold.red
+    puts "Warning: no %check section in spec, "\
+         "manually verify functionality!".bold.red
   end
 
   pkg.commit
 
   puts "#{gem_name} commit complete".green
+  puts "Package located in #{pkg.path.bold}"
   puts "Push commit with: git push".blue
-  puts "Build and tag official rpms with: #{Polisher::GitPackage::PKG_CMD} build".blue
+  puts "Build and tag official rpms with: #{Polisher::Git::Pkg.pkg_cmd} build".blue
 end

data/bin/ruby_rpm_spec_updater.rb

@@ -19,7 +19,7 @@ require 'polisher'
 
 spec_file = ARGV.shift
 source    = ARGV.shift
-rpmspec   = Polisher::RPMSpec.parse File.read(spec_file)
+rpmspec   = Polisher::RPM::Spec.parse File.read(spec_file)
 source    = source.nil? ?
   Polisher::Gem.retrieve(rpmspec.gem_name) :
   Polisher::Upstream.parse(source)

data/lib/polisher.rb

@@ -4,7 +4,9 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/core'
-require 'polisher/rpmspec'
+require 'polisher/error'
+require 'polisher/rpm/requirement'
+require 'polisher/rpm/spec'
 require 'polisher/gem'
 require 'polisher/upstream'
 require 'polisher/gemfile'

data/lib/polisher/core.rb

@@ -3,7 +3,50 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/rpmspec'
+class Object
+  def eigenclass
+    class << self
+      self
+    end
+  end
+end
+
+module ConfHelpers
+  # Defines a 'config attribute' or attribute on the class
+  # which this is defined in. Accessors to the single shared
+  # attribute will be added to the class as well as instances
+  # of the class. Specify the default value with the attr name
+  # or via an env variable
+  #
+  # @example
+  #   class Custom
+  #     extend ConfHelpers
+  #     conf_attr :data_dir, '/etc/'
+  #   end
+  #   Custom.data_dir # => '/etc/'
+  #   ENV['POLISHER_DATA_DIR'] = '/usr/'
+  #   Custom.data_dir # => '/usr/'
+  #   Custom.data_dir == Custom.new.data_dir # => true
+  #
+  def conf_attr(name, default=nil)
+    self.send(:define_singleton_method, name) do |*args|
+      nvar = "@#{name}".intern
+      current = self.instance_variable_get(nvar)
+      envk    = "POLISHER_#{name.to_s.upcase}"
+      self.instance_variable_set(nvar, default)    unless current
+      self.instance_variable_set(ENV[envk])        if ENV.has_key?(envk)
+      # TODO also allow vars to be able to be set from a conf file
+      self.instance_variable_set(nvar, args.first) unless args.empty?
+      self.instance_variable_get(nvar)
+    end
+
+    self.send(:define_method, name) do
+      self.class.send(name)
+    end
+  end
+end
+
+require 'polisher/rpm/spec'
 
 class String
   # Return bool indicating if self is a path to a gem
@@ -25,8 +68,8 @@ class String
   # macro correspondents. If no rpm macro is specified macro will
   # simply be removed
   def unrpmize
-    fmm = Polisher::RPMSpec::FILE_MACRO_MATCHERS
-    fmr = Polisher::RPMSpec::FILE_MACRO_REPLACEMENTS
+    fmm = Polisher::RPM::Spec::FILE_MACRO_MATCHERS
+    fmr = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS
     f = fmm.inject(self) { |file, matcher| file.gsub(matcher, '') }
     f = fmr.keys.inject(f) { |file, r| file.gsub(Regexp.new(r), fmr[r]) }
     f
@@ -35,7 +78,7 @@ class String
   # Replace all occurrances of non-rpm macro strings in self
   # with their macro correspondences
   def rpmize
-    fmr = Polisher::RPMSpec::FILE_MACRO_REPLACEMENTS.invert
+    fmr = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS.invert
     fmr.keys.inject(self) { |file, r| file.gsub(r, fmr[r]) }
   end
 end

data/lib/polisher/errata.rb

@@ -17,7 +17,6 @@ module Polisher
         c.ssl_verify_host = false
         c.http_auth_types = :negotiate
         c.userpwd = ':'
-        c.get
       end
 
       @curl.url = url

data/lib/polisher/error.rb

@@ -0,0 +1,7 @@
+# Polisher Errors
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+class PolisherError < StandardError
+end

data/lib/polisher/gem.rb

@@ -15,9 +15,12 @@ require 'active_support/core_ext'
 
 require 'polisher/version_checker'
 require 'polisher/gem_cache'
+require 'polisher/vendor'
 
 module Polisher
   class Gem
+    include HasVendoredDeps
+
     GEM_CMD      = '/usr/bin/gem'
     DIFF_CMD     = '/usr/bin/diff'
 
@@ -64,6 +67,58 @@ module Polisher
       versions
     end
 
+    # Return new instance of Gem from JSON Specification
+    def self.from_json(json)
+      specj     = JSON.parse(json)
+      metadata           = {}
+      metadata[:spec]    = specj
+      metadata[:name]    = specj['name']
+      metadata[:version] = specj['version']
+
+      metadata[:deps] =
+        specj['dependencies']['runtime'].collect { |d|
+          ::Gem::Dependency.new d['name'], *d['requirements'].split(',')
+        }
+
+      metadata[:dev_deps] =
+        specj['dependencies']['development'].collect { |d|
+          ::Gem::Dependency.new d['name'], d['requirements'].split(',')
+        }
+
+      self.new metadata
+    end
+
+    # Return new instance of Gem from Gemspec
+    def self.from_gemspec(gemspec)
+      gemspec  =
+        ::Gem::Specification.load(gemspec) if !gemspec.is_a?(::Gem::Specification) &&
+                                               File.exists?(gemspec)
+
+      metadata           = {}
+      metadata[:spec]    = gemspec
+      metadata[:name]    = gemspec.name
+      metadata[:version] = gemspec.version.to_s
+
+      metadata[:deps] =
+        gemspec.dependencies.select { |dep|
+          dep.type == :runtime
+        }.collect { |dep| dep }
+
+      metadata[:dev_deps] =
+        gemspec.dependencies.select { |dep|
+          dep.type == :development
+        }.collect { |dep| dep }
+
+      self.new metadata
+    end
+
+    # Return new instance of Gem from rubygem
+    def self.from_gem(gem_path)
+      gem = self.parse :gemspec => ::Gem::Package.new(gem_path).spec
+      gem.path = gem_path
+      gem
+    end
+
     # Parse the specified gemspec & return new Gem instance from metadata
     # 
     # @param [String,Hash] args contents of actual gemspec of option hash
@@ -71,72 +126,65 @@ module Polisher
     # @option args [String] :gemspec path to gemspec to load / parse
     # @return [Polisher::Gem] gem instantiated from gemspec metadata
     def self.parse(args={})
-      metadata = {}
-
       if args.is_a?(String)
-        specj     = JSON.parse(args)
-        metadata[:spec]    = specj
-        metadata[:name]    = specj['name']
-        metadata[:version] = specj['version']
-
-        metadata[:deps] =
-          specj['dependencies']['runtime'].collect { |d|
-            ::Gem::Dependency.new d['name'], *d['requirements'].split(',')
-          }
-
-        metadata[:dev_deps] =
-          specj['dependencies']['development'].collect { |d|
-            ::Gem::Dependency.new d['name'], d['requirements'].split(',')
-          }
+        return self.from_json args
 
       elsif args.has_key?(:gemspec)
-        gemspec  = ::Gem::Specification.load(args[:gemspec])
-        metadata[:spec]    = gemspec # TODO to json
-        metadata[:name]    = gemspec.name
-        metadata[:version] = gemspec.version.to_s
-
-        metadata[:deps] =
-          gemspec.dependencies.select { |dep|
-            dep.type == :runtime
-          }.collect { |dep| dep }
-
-        metadata[:dev_deps] =
-          gemspec.dependencies.select { |dep|
-            dep.type == :development
-          }.collect { |dep| dep }
+        return self.from_gemspec args[:gemspec]
 
       elsif args.has_key?(:gem)
-        # TODO
+        return self.from_gem args[:gem]
+
       end
 
-      self.new metadata
+      self.new
     end
 
-    # Download the gem and return the binary file contents as a string
+    # Return handler to internal curl helper
+    def self.client
+      @client ||= Curl::Easy.new
+    end
+
+    # Download the specified gem and return the binary file contents as a string
     #
     # @return [String] binary gem contents
-    def download_gem
-      cached = GemCache.get(@name, @version)
+    def self.download_gem(name, version)
+      cached = GemCache.get(name, version)
       return cached unless cached.nil?
 
-      # TODO utilize a singleton curl instance (akin to errata module)
-      gem_path = "https://rubygems.org/gems/#{@name}-#{@version}.gem"
-      curl = Curl::Easy.new(gem_path)
-      curl.follow_location = true
-      curl.http_get
-      gemf = curl.body_str
+      client.url = "https://rubygems.org/gems/#{name}-#{version}.gem"
+      client.follow_location = true
+      client.http_get
+      gemf = client.body_str
 
-      GemCache.set(@name, @version, gemf)
+      GemCache.set(name, version, gemf)
       gemf
     end
 
+    # Download the local gem and return it as a string
+    def download_gem
+      self.class.download_gem @name, @version
+    end
+
+    # Download the specified gem / version from rubygems and
+    # return instance of Polisher::Gem class corresponding to it
+    def self.from_rubygems(name, version)
+      download_gem name, version
+      self.from_gem downloaded_gem_path(name, version)
+    end
+
     # Returns path to downloaded gem
     #
     # @return [String] path to downloaded gem
-    def downloaded_gem_path
+    def self.downloaded_gem_path(name, version)
       # ensure gem is downloaded
-      self.download_gem
-      GemCache.path_for(@name, @version)
+      self.download_gem(name, version)
+      GemCache.path_for(name, version)
+    end
+
+    # Return path to downloaded gem
+    def downloaded_gem_path
+      self.class.downloaded_gem_path @name, @version
     end
 
     # Returns path to gem, either specified one of downloaded one
@@ -170,7 +218,8 @@ module Polisher
       self.unpack do |dir|
         Pathname(dir).find do |path|
           next if path.to_s == dir.to_s
-          bl.call path
+          pathstr = path.to_s.gsub("#{dir}/", '')
+          bl.call pathstr unless pathstr.blank?
         end
       end
     end
@@ -182,8 +231,7 @@ module Polisher
       @file_paths ||= begin
         files = []
         self.each_file do |path|
-          pathstr = path.to_s.gsub("#{dir}/", '')
-          files << pathstr unless pathstr.blank?
+          files << path
         end
         files
       end
@@ -212,9 +260,10 @@ module Polisher
     def versions(args={}, &bl)
       recursive = args[:recursive]
       dev_deps  = args[:dev_deps]
-
       versions  = args[:versions] || {}
-      versions.merge!({ self.name => Polisher::VersionChecker.versions_for(self.name, &bl) })
+
+      gem_versions = Polisher::VersionChecker.versions_for(self.name, &bl)
+      versions.merge!({ self.name => gem_versions })
       args[:versions] = versions
 
       if recursive
@@ -237,42 +286,21 @@ module Polisher
       versions
     end
 
-    # Return list of file paths marked as vendored
-    def vendored_file_paths
-      self.file_paths.select { |f| f.include?('vendor/') }
-    end
-
-    # Return list of vendered gems in file list
-    def vendored
-      vendored_file_paths.inject({}){ |v,fp|
-        vendored_file = fp.split('/')
-        vendor_index  = vendored_file.index('vendor')
-
-        # only process vendor'd dirs:
-        next v if vendor_index + 2 == vendored_file.size
-
-        vname = vendored_file[vendor_index + 1]
-        vversion = nil
-        # TODO set vversion from version.rb:
-        #vf.last.downcase == 'version.rb'
-        v[vname] = vversion
-        v
-      }
-    end
-
     # Return diff of content in this gem against other
     def diff(other)
       out = nil
 
       begin
         this_dir  = self.unpack
-        other_dir = other.unpack
+        other_dir = other.is_a?(Polisher::Gem) ? other.unpack :
+                   (other.is_a?(Polisher::Git::Repo) ? other.path : other)
         result = AwesomeSpawn.run("#{DIFF_CMD} -r #{this_dir} #{other_dir}")
-        out = result.output
+        out = result.output.gsub("#{this_dir}", 'a').gsub("#{other_dir}", 'b')
       rescue
       ensure
-        FileUtils.rm_rf this_dir
-        FileUtils.rm_rf other_dir
+        FileUtils.rm_rf this_dir  unless this_dir.nil?
+        FileUtils.rm_rf other_dir unless  other_dir.nil? ||
+                                         !other.is_a?(Polisher::Gem)
       end
 
       out