revamp 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b51f7d8a5131362e3a62f11f793badcde062ae
-  data.tar.gz: 4d52b7acb8b943afba20de08cb4ca43f78fe6c14
+  metadata.gz: b0688d93de82281a4b9a6b73132d736a10f92cb8
+  data.tar.gz: 55ad5ec9f79efb859a25f623ab5cdba1c47f8713
 SHA512:
-  metadata.gz: 90666b3898f0faf54cc41dead7e1d2cd575c9b7ce6d19ef3a2cb2e33c546cb9e0edb877254a72984f177fbe681aedf5f6188c15339c7c489128b3c2ef33f2b3b
-  data.tar.gz: d00fcbc8c3a5d404c1706719adf5cfa82cb6300f5714c831dd3d56b4c8f87d7561fdac861d4fb6b498f3828b38dc9022ea2147727706a5b6034f48826ede8ecf
+  metadata.gz: 57ffbe79238028462f58a583f323c1b889711eb355f3c068367ae816fa22824ba04891a3e1828325bb36808b369bd8052eb57f4d485ddc66916343c44717e679
+  data.tar.gz: 3d4c74dca145077d4b98d67032a58242b388aefa57885174f549c83f518a856cc4bdc37a8465281d054f279de83d7bc721a5d2fb5d0128b27cb0009a6ff76801

data/lib/revamp/application.rb

@@ -8,20 +8,37 @@ class Revamp::Application
     @options   = options
     @filenames = options[:filenames]
     @format    = :rpm
+    @log       = Revamp.logger
   end
 
   def run!
+    converted = []
     @filenames.each do |file|
+      @log.info("Processing file: #{file} ...")
       parser = Revamp::Parser::PuppetTarball.new(file)
       model = parser.parse
       persister = build_persister
-      persister.persist(model)
+      target = persister.persist(model)
+      report(converted, persister, target)
     end
-    Revamp.logger.info("Files successfully converted: #{@filenames.size}.")
+    @log.info("#{converted.size} files converted.")
   end
 
   protected
 
+  def report(converted, persister, target)
+    if persister.respond_to? :persisted?
+      if persister.persisted?
+        converted << target
+      else
+        @log.info("File #{target} is already converted and clobber is false, skipped.")
+      end
+    else
+      converted << target
+    end
+    converted
+  end
+
   def build_persister
     persister = case @format
                 when :rpm then Revamp::Persister::Rpm.new

data/lib/revamp/cli.rb

@@ -80,6 +80,7 @@ Usage: #{$PROGRAM_NAME} [options]
       p.option :filenames, 'Files which will be processed', default: []
       p.option :verbose, 'Should print all information, by default: false', default: false
       p.option :cleanup, 'Should temporary files be cleaned up, by default: true', default: true
+      p.option :clobber, 'Should overwrite output converted packages, by default: false', default: false
     end
   end
 

data/lib/revamp/filter/puppetver2rpmreq.rb

@@ -15,8 +15,8 @@ class Revamp::Filter::PuppetVerToRpmReq
   end
 
   # Filters a Puppet version
-  # @param [puppetver] Revamp::Model::PuppetDependency
-  # @return String[]
+  # @param [puppetver] Revamp::Model::PuppetDependency a puppet dependency object
+  # @return String[] a array of puppet compatibile version specs
   def filter(puppetver)
     @slug = slugger.map(puppetver.name)
     reqs = []

data/lib/revamp/persister/rpm/builder.rb

@@ -0,0 +1,143 @@
+require 'revamp'
+require 'revamp/persister/rpm/commandline'
+
+# A internal methods for builder
+module Revamp::Persister::Rpm::BuilderInternals
+  def configure_rpm_requirements_line
+    req = []
+    model.dependencies.each { |dep| req += Revamp::Filter::PuppetVerToRpmReq.new.filter(dep) }
+    req.join(', ')
+  end
+
+  def erbize(template, vars)
+    values = OpenStruct.new(vars).instance_eval { binding }
+    ERB.new(template).result(values)
+  end
+
+  def cleanup_files(files)
+    @log.debug("Files to be cleaned up: #{files}")
+    readable = files.reject { |path| !path.readable? }
+    readable.each do |path|
+      path.directory? ? FileUtils.rm_r(path) : path.unlink
+    end
+  end
+end
+
+# A builder for RPM's packages
+class Revamp::Persister::Rpm::Builder
+  SOURCES = 'SOURCES'
+  SPECS   = 'SPECS'
+  RPMS    = 'RPMS'
+  SELFDIR = Pathname.new(__FILE__).dirname
+  ATTRS   = [
+    :name, :version, :filename, :rpm, :model, :tmpdir, :release, :filenames,
+    :specfile, :has_requirements, :requirements, :options
+  ]
+  ATTRS.each { |attr| attr_accessor(attr) }
+  attr_reader :produced
+  alias_method :produced?, :produced
+
+  def initialize(model, dir, options)
+    @options  = options
+    @name     = "puppetmodule_#{model.slugname}"
+    @release  = options[:release]
+    assign_model(model)
+    @filename = "#{name}-#{version}-#{release}.noarch.rpm"
+    @rpm      = "#{name}-#{version}"
+    @specfile = rpm + '.spec'
+    @tmpdir   = dir
+    @produced = false
+    @log      = Revamp.logger
+    @requirements = configure_rpm_requirements_line
+    @log.debug("Target file: #{target}")
+  end
+
+  def produce
+    if needs_to_write?
+      @log.info("Converting to RPM package #{target}...")
+      cmd = "rpmbuild -ba #{SPECS}/#{specfile}"
+      verbose = options[:verbose]
+      ret = Revamp::Persister::Rpm::CommandLine.execute(cmd, tmpdir, verbose)
+      fail "RPM Build failed with retcode = #{ret.exitstatus}" unless ret.success?
+    end
+    move_produced
+  end
+
+  def make_structure
+    return unless needs_to_write?
+    FileUtils.mkdir_p(tmpdir.join(SOURCES))
+    FileUtils.mkdir_p(tmpdir.join(SPECS))
+  end
+
+  def write_spec
+    File.open(specfile_path, 'w') { |file| file.write(generate_spec) } if needs_to_write?
+  end
+
+  def write_sources
+    return unless needs_to_write?
+    pathsufix = Pathname.new(rpm)
+    File.open(sources_tgz_path, 'wb') do |tgz|
+      Zlib::GzipWriter.wrap(tgz) do |gz|
+        Gem::Package::TarWriter.new(gz) do |tar|
+          model.files.each do |file, content|
+            full = pathsufix.join(file).to_s
+            tar.add_file_simple(full, 0644, content.length) { |io| io.write(content) }
+          end
+        end
+      end
+    end
+  end
+
+  def cleanup
+    arch = RbConfig::CONFIG['arch'].gsub('-linux', '')
+    cleanup_files [
+      sources_tgz_path, specfile_path, tmpdir.join('BUILD').join(rpm),
+      tmpdir.join('BUILDROOT').join("#{rpm}-#{release}.#{arch}")
+    ]
+  end
+
+  protected
+
+  def generate_spec
+    tpl = SELFDIR.join('rpm-spec.erb')
+    values = Hash[ATTRS.map { |key| [key, send(key)] }]
+    erbize(tpl.read, values)
+  end
+
+  private
+
+  def assign_model(model)
+    @model            = model
+    @filenames        = model.files.keys
+    @version          = model.version
+    @has_requirements = model.dependencies.any?
+  end
+
+  def sources_tgz_path
+    tmpdir.join(SOURCES).join("#{rpm}.tar.gz")
+  end
+
+  def specfile_path
+    tmpdir.join(SPECS).join(specfile)
+  end
+
+  def target
+    Pathname.new(options[:outdir]).join(filename)
+  end
+
+  def move_produced
+    produced = tmpdir.join(RPMS).join('noarch').join(filename)
+    @log.debug("Produced RPM in build dir: #{produced}")
+    if needs_to_write?
+      FileUtils.mv(produced, target)
+      @produced = true
+    end
+    target
+  end
+
+  def needs_to_write?
+    !File.exist?(target) || options[:clobber]
+  end
+
+  include Revamp::Persister::Rpm::BuilderInternals
+end

data/lib/revamp/persister/rpm/commandline.rb

@@ -0,0 +1,13 @@
+# A command line executor for command line
+class Revamp::Persister::Rpm::CommandLine
+  class << self
+    def execute(command, directory, verbose)
+      Revamp.logger.debug("Executing: '#{command}' in directory: '#{directory}'")
+      out = '/dev/null'
+      out = $stdout if verbose
+      pid = Process.spawn(command, chdir: directory, out: out, err: out)
+      Process.wait pid
+      $? # rubocop:disable SpecialGlobalVars
+    end
+  end
+end

data/lib/revamp/persister/{rpm-spec.erb → rpm/rpm-spec.erb}

@@ -6,7 +6,10 @@ Source0: <%= rpm %>.tar.gz
 License: <%= model.license %>
 Group: Development
 BuildArch: noarch
-Provides: puppetmodule(<%= model.slugname %>)
+Provides: puppetmodule(<%= model.slugname %>) = <%= model.version %>
+Provides: puppetmodule(<%= model.slugname %>) = <%= model.version %>-<%= release %>
+Provides: puppetmodule_<%= model.slugname %> = <%= model.version %>
+Provides: puppetmodule_<%= model.slugname %> = <%= model.version %>-<%= release %>
 <% if has_requirements %>Requires: <%= requirements %><% end %>
 %description
 <%= model.summary %>
@@ -25,4 +28,4 @@ mv ${RPM_BUILD_ROOT}%{_sysconfdir}/puppet/modules/<%= rpm %> ${RPM_BUILD_ROOT}%{
 %dir %{_sysconfdir}/puppet/modules
 %dir %{_sysconfdir}/puppet/modules/<%= model.rawname %>
 <% filenames.each do |file| %>%{_sysconfdir}/puppet/modules/<%= model.rawname %>/<%= file %>
-<% end %>
+<% end %>

data/lib/revamp/persister/rpm.rb

@@ -4,7 +4,6 @@ require 'tmpdir'
 require 'erb'
 require 'ostruct'
 require 'rbconfig'
-require 'revamp/filter/puppetver2rpmreq'
 
 # A main RPM persister
 class Revamp::Persister::Rpm
@@ -17,141 +16,18 @@ class Revamp::Persister::Rpm
   def persist(model)
     dir = File.expand_path('~')
     workdir = Pathname.new(dir).join('rpmbuild')
-    builder = Builder.new(model, workdir, options)
-    builder.make_structure
-    builder.write_spec
-    builder.write_sources
-    produced = builder.produce
-    builder.cleanup if options[:cleanup]
-    produced
+    @builder = Builder.new(model, workdir, options)
+    @builder.make_structure
+    @builder.write_spec
+    @builder.write_sources
+    target = @builder.produce
+    @builder.cleanup if options[:cleanup]
+    target
   end
 
-  # A command line executor for command line
-  class CommandLine
-    class << self
-      def execute(command, directory, verbose)
-        Revamp.logger.debug("Executing: '#{command}' in directory: '#{directory}'")
-        out = '/dev/null'
-        out = $stdout if verbose
-        pid = Process.spawn(command, chdir: directory, out: out, err: out)
-        Process.wait pid
-        $? # rubocop:disable SpecialGlobalVars
-      end
-    end
-  end
-
-  # A builder for RPM's packages
-  class Builder
-    SOURCES = 'SOURCES'
-    SPECS   = 'SPECS'
-    RPMS    = 'RPMS'
-    SELFDIR = Pathname.new(__FILE__).dirname
-    ATTRS   = [
-      :name, :version, :filename, :rpm,
-      :model, :tmpdir, :release, :filenames,
-      :specfile, :has_requirements,
-      :requirements, :options
-    ]
-    ATTRS.each { |attr| attr_accessor(attr) }
-
-    def initialize(model, dir, options)
-      @options   = options
-      @name      = "puppetmodule_#{model.slugname}"
-      @release   = options[:release]
-      @version   = model.version
-      @filename  = "#{name}-#{version}-#{release}.noarch.rpm"
-      @rpm       = "#{name}-#{version}"
-      @specfile  = rpm + '.spec'
-      @model     = model
-      @tmpdir    = dir
-      @filenames = model.files.keys
-      @has_requirements = model.dependencies.any?
-      @requirements     = configure_rpm_requirements_line
-    end
-
-    def configure_rpm_requirements_line
-      req = []
-      model.dependencies.each do |dep|
-        req += Revamp::Filter::PuppetVerToRpmReq.new.filter(dep)
-      end
-      req.join(', ')
-    end
-
-    def make_structure
-      FileUtils.mkdir_p(tmpdir.join(SOURCES))
-      FileUtils.mkdir_p(tmpdir.join(SPECS))
-    end
-
-    def erbize(template, vars)
-      values = OpenStruct.new(vars).instance_eval { binding }
-      ERB.new(template).result(values)
-    end
-
-    def write_spec
-      tpl = SELFDIR.join('rpm-spec.erb')
-      values = Hash[ATTRS.map { |key| [key, send(key)] }]
-      spec = erbize(tpl.read, values)
-      File.open(specfile_path, 'w') { |file| file.write(spec) }
-    end
-
-    def write_sources
-      pathsufix = Pathname.new(rpm)
-      File.open(sources_tgz_path, 'wb') do |tgz|
-        Zlib::GzipWriter.wrap(tgz) do |gz|
-          Gem::Package::TarWriter.new(gz) do |tar|
-            model.files.each do |file, content|
-              full = pathsufix.join(file).to_s
-              tar.add_file_simple(full, 0644, content.length) { |io| io.write(content) }
-            end
-          end
-        end
-      end
-    end
-
-    def sources_tgz_path
-      sources = tmpdir.join(SOURCES)
-      sources.join("#{rpm}.tar.gz")
-    end
-
-    def specfile_path
-      tmpdir.join(SPECS).join(specfile)
-    end
-
-    def target
-      outdir = options[:outdir]
-      Pathname.new(outdir).join(filename)
-    end
-
-    def produce
-      Revamp.logger.info("Converting to RPM package #{target}...")
-      cmd = "rpmbuild -ba #{SPECS}/#{specfile}"
-      verbose = options[:verbose]
-      ret = Revamp::Persister::Rpm::CommandLine.execute(cmd, tmpdir, verbose)
-      fail "RPM Build failed with retcode = #{ret.exitstatus}" unless ret.success?
-      move_produced
-      target
-    end
-
-    def move_produced
-      produced = tmpdir.join(RPMS).join('noarch').join(filename)
-      Revamp.logger.debug("Produced RPM in build dir: #{produced}")
-      FileUtils.mv(produced, target)
-    end
-
-    def cleanup
-      arch = RbConfig::CONFIG['arch'].gsub('-linux', '')
-      cleanup_files [
-        sources_tgz_path, specfile_path, tmpdir.join('BUILD').join(rpm),
-        tmpdir.join('BUILDROOT').join("#{rpm}-#{release}.#{arch}")
-      ]
-    end
-
-    def cleanup_files(files)
-      Revamp.logger.debug("Files to be cleaned up: #{files}")
-      readable = files.reject { |path| !path.readable? }
-      readable.each do |path|
-        path.directory? ? FileUtils.rm_r(path) : path.unlink
-      end
-    end
+  def persisted?
+    @builder.nil? ? false : @builder.produced?
   end
 end
+
+require 'revamp/persister/rpm/builder'

data/lib/revamp/version.rb

@@ -14,7 +14,7 @@ module Revamp
   end
 
   # Version for Herald
-  VERSION     = version_prep '1.0.1'
+  VERSION     = version_prep '1.1.0'
   # Lincense for Herald
   LICENSE     = 'Apache-2.0'
   # Project name

data/lib/revamp.rb

@@ -25,7 +25,7 @@ module Revamp
       filepath = file.path
       file.close
       file.unlink
-      message = "v#{Revamp::VERSION}-#{ex.class}: #{ex.message}"
+      message = "v#{Revamp::VERSION} #{ex.class}: #{ex.message}"
       contents = message + "\n\n" + ex.backtrace.join("\n") + "\n"
       File.write(filepath, contents)
       bugo = {
@@ -37,26 +37,32 @@ module Revamp
       bugo
     end
   end
-end
-
-# A module for modeles
-module Revamp::Model
-end
+  # A module for modeles
+  module Model
+  end
 
-# A module for mapper
-module Revamp::Mapper
-end
+  # A module for mapper
+  module Mapper
+  end
 
-# A module for persister
-module Revamp::Persister
-end
+  # A module for persister
+  module Persister
+  end
 
-# Parser module
-module Revamp::Parser
-end
+  # Parser module
+  module Parser
+  end
 
-# A module for filters of persiters
-module Revamp::Filter
+  # A module for filters of persiters
+  module Filter
+  end
 end
 
 require 'revamp/version'
+require 'revamp/model/puppet-module'
+require 'revamp/mapper/puppet-name-slugger'
+require 'revamp/persister/rpm'
+require 'revamp/filter/puppetver2rpmreq'
+require 'revamp/parser/puppet-tarball'
+require 'revamp/application'
+require 'revamp/cli'

data/spec/spec_helper.rb

@@ -47,3 +47,5 @@ RSpec.configure do |c|
     mock.syntax = [:expect]
   end
 end
+
+require 'revamp'

data/spec/unit/revamp/application_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Revamp::Application do
+  before(:each) do
+    # Testing protected methods!!
+    described_class.send(:public, *described_class.protected_instance_methods)
+    @level = Revamp.logger.level
+    Revamp.logger.level = 100
+  end
+  after(:each) do
+    Revamp.logger.level = @level
+  end
+  let(:options) { {} }
+  let(:converted) { [] }
+  let(:target) { '/a/target/file.o' }
+  let(:instance) { described_class.new(options)}
+
+  describe '#report' do
+    subject { instance.report(converted, persister, target) }
+    context 'on non supporting :persisted?' do
+      let(:persister) { double() }
+      it { expect(subject).to eq([target]) }
+    end
+    context 'on non persisted one' do
+      let(:persister) { double(:persisted? => false) }
+      it { expect(subject).to eq([]) }
+      it { expect(subject).to be_empty }
+    end
+    context 'on persisted one' do
+      let(:persister) { double(:persisted? => true) }
+      it { expect(subject).to eq([target]) }
+    end
+  end
+
+end

data/spec/unit/revamp/cli_spec.rb

@@ -112,9 +112,10 @@ describe Revamp::CLI do
           outdir:    "/tmp",
           filenames: ["spec/fixtures/coi-sample-0.1.1.tar.gz"],
           verbose:   false,
-          cleanup:   true
+          cleanup:   true,
+          clobber:   false
         })
       end
     end
   end
-end
+end

data/spec/unit/revamp/persister/rpm/builder_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Revamp::Persister::Rpm::Builder do
+  let(:model) do
+    mod = Revamp::Model::PuppetModule.new
+    mod.name = 'puppetlabs/apache'
+    mod.version = '3.5.1'
+    mod.license = 'Apache-2.0'
+    mod.summary = 'Installs, configures, and manages Apache virtual hosts, web services, and modules.'
+    mod.dependencies = [
+      {'name' => 'puppetlabs/concat', 'version_requirement' => '>= 1.0.5 <2.0.0'}
+    ]
+    mod
+  end
+  let(:spec) do
+    <<-eos
+Name: puppetmodule_puppetlabs-apache
+Version: 3.5.1
+Release: 42
+Summary: Installs, configures, and manages Apache virtual hosts, web services, and modules.
+Source0: puppetmodule_puppetlabs-apache-3.5.1.tar.gz
+License: Apache-2.0
+Group: Development
+BuildArch: noarch
+Provides: puppetmodule(puppetlabs-apache) = 3.5.1
+Provides: puppetmodule(puppetlabs-apache) = 3.5.1-42
+Provides: puppetmodule_puppetlabs-apache = 3.5.1
+Provides: puppetmodule_puppetlabs-apache = 3.5.1-42
+Requires: puppetmodule(puppetlabs-concat) >= 1.0.5, puppetmodule(puppetlabs-concat) < 2.0.0
+%description
+Installs, configures, and manages Apache virtual hosts, web services, and modules.
+%prep
+%setup
+%build
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}/etc/puppet/modules
+cp -r %{_builddir}/puppetmodule_puppetlabs-apache-3.5.1 ${RPM_BUILD_ROOT}%{_sysconfdir}/puppet/modules
+mv ${RPM_BUILD_ROOT}%{_sysconfdir}/puppet/modules/puppetmodule_puppetlabs-apache-3.5.1 ${RPM_BUILD_ROOT}%{_sysconfdir}/puppet/modules/apache
+%clean
+%post
+%files
+%dir %{_sysconfdir}/puppet
+%dir %{_sysconfdir}/puppet/modules
+%dir %{_sysconfdir}/puppet/modules/apache
+
+    eos
+  end
+  before(:each) do
+    # Testing protected methods!!
+    described_class.send(:public, *described_class.protected_instance_methods)
+  end
+  let(:dir) { Dir.tmpdir }
+  let(:options) { { :release => 42, :outdir => '/tmp/revamp-output' } }
+  let(:instance) { described_class.new(model, dir, options) }
+  describe '#generate_spec' do
+    subject { instance.generate_spec }
+    it { expect(subject).to eq spec }
+    it { expect(subject).to match /Version: 3\.5\.1/ }
+  end
+end

data/spec/unit/revamp/persister/{rpm_spec.rb → rpm/commandline_spec.rb}

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'revamp/persister/rpm'
 require 'rbconfig'
 
 describe Revamp::Persister::Rpm::CommandLine do
@@ -29,4 +28,4 @@ describe Revamp::Persister::Rpm::CommandLine do
     subject { described_class.execute(command, directory, options) }
     it { expect(subject).to be_success }
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: revamp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Centralny Ośrodek Informatyki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,17 +83,21 @@ files:
 - lib/revamp/mapper/puppet-name-slugger.rb
 - lib/revamp/model/puppet-module.rb
 - lib/revamp/parser/puppet-tarball.rb
-- lib/revamp/persister/rpm-spec.erb
 - lib/revamp/persister/rpm.rb
+- lib/revamp/persister/rpm/builder.rb
+- lib/revamp/persister/rpm/commandline.rb
+- lib/revamp/persister/rpm/rpm-spec.erb
 - lib/revamp/version.rb
 - revamp.gemspec
 - spec/file_matchers.rb
 - spec/fixtures/coi-sample-0.1.1.tar.gz
 - spec/spec_helper.rb
+- spec/unit/revamp/application_spec.rb
 - spec/unit/revamp/cli_spec.rb
 - spec/unit/revamp/filter/puppetver2rpmreq_spec.rb
 - spec/unit/revamp/parser/puppet-tarball_spec.rb
-- spec/unit/revamp/persister/rpm_spec.rb
+- spec/unit/revamp/persister/rpm/builder_spec.rb
+- spec/unit/revamp/persister/rpm/commandline_spec.rb
 - spec/unit/revamp/version_spec.rb
 - spec/unit/revamp_spec.rb
 homepage: https://github.com/coi-gov-pl/gem-revamp
@@ -124,10 +128,12 @@ test_files:
 - spec/file_matchers.rb
 - spec/fixtures/coi-sample-0.1.1.tar.gz
 - spec/spec_helper.rb
+- spec/unit/revamp/application_spec.rb
 - spec/unit/revamp/cli_spec.rb
 - spec/unit/revamp/filter/puppetver2rpmreq_spec.rb
 - spec/unit/revamp/parser/puppet-tarball_spec.rb
-- spec/unit/revamp/persister/rpm_spec.rb
+- spec/unit/revamp/persister/rpm/builder_spec.rb
+- spec/unit/revamp/persister/rpm/commandline_spec.rb
 - spec/unit/revamp/version_spec.rb
 - spec/unit/revamp_spec.rb
 has_rdoc: