revamp 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0688d93de82281a4b9a6b73132d736a10f92cb8
-  data.tar.gz: 55ad5ec9f79efb859a25f623ab5cdba1c47f8713
+  metadata.gz: 977ae7b4decd86aabb3362345be51bd29f01c4d0
+  data.tar.gz: 7450ae67ed864623830f48317e17f11d78334704
 SHA512:
-  metadata.gz: 57ffbe79238028462f58a583f323c1b889711eb355f3c068367ae816fa22824ba04891a3e1828325bb36808b369bd8052eb57f4d485ddc66916343c44717e679
-  data.tar.gz: 3d4c74dca145077d4b98d67032a58242b388aefa57885174f549c83f518a856cc4bdc37a8465281d054f279de83d7bc721a5d2fb5d0128b27cb0009a6ff76801
+  metadata.gz: 07f2b7d4f8f00c1522eaddfdefff0634099f1970b54bd1c333ab2e1f309a41341023b340cd6e857d7920349112c2a0c48cbf543aef2fe0fa1aa313dfcf527bfb
+  data.tar.gz: 0cea0a5bb03501c4de5a5fbdf3fc2bfc64357c2db9305a7b9ec4e8f4805a0c8ab8133b042dac7cba27c489c9876df505bdfc556bb90f3ffcc21979f88f08d0d6

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.rubocop.yml

@@ -3,6 +3,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 1.9
   Include:
     - 'lib/**/*.rb'
     - 'bin/*'
@@ -25,5 +26,6 @@ Metrics/MethodLength:
 
 Metrics/AbcSize:
   Max: 20
-Style/ClassAndModuleChildren: 
-  EnforcedStyle: compact
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact

data/.travis.yml

@@ -5,11 +5,12 @@ bundler_args: --without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-ven
 cache: bundler
 script:
   - bundle exec rake test
-before_install: rm -f Gemfile.lock
 rvm:
   - '1.9'
   - '2.0'
   - '2.1'
   - '2.2'
+  - '2.3'
+  - '2.4'
 notifications:
   email: false

data/Gemfile

@@ -11,6 +11,7 @@ group :test do
   gem 'inch',                      '~> 0.7.0',  require: false
   gem 'coveralls',                 '~> 0.8.9',  require: false
   gem 'codeclimate-test-reporter', '~> 0.4.8',  require: false
+  gem 'tins',                      '~> 1.6.0',  require: false if RUBY_VERSION < '2.0.0'
 end
 
 group :development do
@@ -21,9 +22,6 @@ group :development do
   gem 'pry-byebug',    '~> 3.2.0',  require: false if RUBY_VERSION > '2.0.0'
 end
 
-local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.ruby19')
-eval_gemfile local_gemfile if File.exist?(local_gemfile)
-
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if File.exist?(local_gemfile)
 

data/Gemfile.lock

@@ -0,0 +1,153 @@
+PATH
+  remote: .
+  specs:
+    revamp (1.1.1)
+      micro-optparse (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
+    codeclimate-test-reporter (0.4.8)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.1)
+    columnize (0.9.0)
+    coveralls (0.8.9)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6.0)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.18)
+    formatador (0.2.5)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.1.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rake (1.0.0)
+      guard
+      rake
+    guard-rubocop (1.2.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    inch (0.7.1)
+      pry
+      sparkr (>= 0.2.0)
+      term-ansicolor
+      yard (~> 0.8.7.5)
+    json (1.8.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.12)
+    method_source (0.8.2)
+    micro-optparse (1.2.0)
+    mime-types (2.99.3)
+    nenv (0.3.0)
+    netrc (0.11.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
+      pry (~> 0.10)
+    rainbow (2.2.2)
+      rake
+    rake (10.4.2)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rubocop (0.34.2)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.8.1)
+    shellany (0.0.1)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    slop (3.6.0)
+    sparkr (0.4.1)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.4)
+    tins (1.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  codeclimate-test-reporter (~> 0.4.8)
+  coveralls (~> 0.8.9)
+  guard (~> 2.13.0)
+  guard-bundler (~> 2.1.0)
+  guard-rake (~> 1.0.0)
+  guard-rubocop (~> 1.2.0)
+  inch (~> 0.7.0)
+  pry-byebug (~> 3.2.0)
+  rake (~> 10.4.0)
+  revamp!
+  rspec (~> 3.3.0)
+  rspec-its (~> 1.2.0)
+  rubocop (~> 0.34.0)
+  simplecov (~> 0.10.0)
+
+BUNDLED WITH
+   1.15.3

data/README.md

@@ -12,7 +12,15 @@ Install it yourself, globally as:
 
 On Debian/Ubuntu systems to convert to RPM you will need also:
 
-    $ sudo apt-get install librpm-dev
+    $ sudo apt-get install -y rpm
+    
+On RHEL systems you will need also:
+
+    $ sudo yum install -y rpm-build
+    
+For convenience thare is a Docker image with system tools and revamp preinstalled: `coigovpl/revamp`. The usage is simply:
+
+    $ docker run --rm coigovpl/revamp revamp --help
 
 ## Usage
 

data/lib/revamp/persister/rpm/rpm-spec.erb

@@ -13,6 +13,7 @@ Provides: puppetmodule_<%= model.slugname %> = <%= model.version %>-<%= release
 <% if has_requirements %>Requires: <%= requirements %><% end %>
 %description
 <%= model.summary %>
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %prep
 %setup
 %build

data/lib/revamp/version.rb

@@ -1,20 +1,7 @@
 # Top level module for Revamp
 module Revamp
-  # Prepare version
-  #
-  # @param desired [String] a desired version
-  # @return [String] a prepared version
-  def self.version_prep(desired)
-    version = desired
-    if desired.match(/[^0-9\.]+/)
-      git = `git describe --tags --dirty --always`
-      version += '.' + git.tr('-', '.')
-    end
-    version.strip
-  end
-
   # Version for Herald
-  VERSION     = version_prep '1.1.0'
+  VERSION     = '1.1.1'
   # Lincense for Herald
   LICENSE     = 'Apache-2.0'
   # Project name

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

@@ -29,6 +29,7 @@ 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.
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %prep
 %setup
 %build

data/spec/unit/revamp/version_spec.rb

@@ -1,13 +1,7 @@
 require 'spec_helper'
 require 'revamp'
 
-describe Revamp, '.version_prep' do
-  context 'on stable version v1.2.3' do
-    subject { Revamp::version_prep '1.2.3' }
-    it { expect(subject).to eq '1.2.3' }
-  end
-  context 'on unstable version v1.2.3.pre' do
-    subject { Revamp::version_prep '1.2.3.pre' }
-    it { expect(subject).to match /^1\.2\.3\.pre\.?(?:v\d+\.\d+\.\d+(?:\.\d+\.g)?)?(?:[0-9a-f]{7})?(?:\.dirty)?$/ }
-  end
+describe Revamp, '::VERSION' do
+  subject { Revamp::VERSION }
+  it { expect(subject).to match /^\d+\.\d+\.\d+(?:\.pre)?$/ }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: revamp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Centralny Ośrodek Informatyki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ files:
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.ruby19
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Converts puppet module file to valid RPM or DEB package

data/Gemfile.ruby19

@@ -1 +0,0 @@
-gem 'tins', '~> 1.6.0',  require: false if RUBY_VERSION < '2.0.0'