buildtasks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69bd0b76c1544df14fd10e1c784b66ad88eca61
-  data.tar.gz: 96f8c19cec88808b2d24294e0ce9c0a1083a2990
+  metadata.gz: 5879afcde9bdcb15af3a1e7f184f6a6f970da13d
+  data.tar.gz: 8334ffcd146bb1dd3034fb8733e8cf0772b2654d
 SHA512:
-  metadata.gz: 7be5522e7cb6cc150fee7be52291cb29ddabc557af5e2e87b4c0416018ef9ba99f9a4e182f76038c79c99dff899cd161fab5247f9bd94f5b556eb6ed90efdfbc
-  data.tar.gz: 4dffdc8d6e54cb63b9a1d0e58784720a056a7383a451f1db30900a7e5a7177311f0486cec4ce992d4798105194b44b07b3a9eba6e18a7e18b7482fa03a679f30
+  metadata.gz: 3c9bd07cc8289ecbc106f4c766cf40732da829e7fcf1c3bda42f228f1e3f495c2690eb6b1aad69895ce85c1bfa31076b42789ffc9455a2c5dd85c87b59928969
+  data.tar.gz: 88eb7463a3f55bf40bab5d3c7c7f615b3622f4dfa40f3711751331661d098a039169ffb015f30b6954d54225d7cd0d20605d0b678167df7ebc14e9efd65365e9

data/.rubocop.yml

@@ -17,7 +17,7 @@ HashSyntax:
   EnforcedStyle: hash_rockets
 LineLength:
   Enabled: false
-SingleSpaceBeforeFirstArg:
+SpaceBeforeFirstArg:
   Enabled: false
 StringLiterals:
   Enabled: false

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 
-rvm: 2.1
+sudo: false
+
+rvm: 2.3.1
 
 script: bundle exec rake test
 

data/buildtasks.gemspec

@@ -5,7 +5,7 @@ require 'buildtasks/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "buildtasks"
-  spec.version       = BuildTasks::VERSION
+  spec.version       = BuildTasks::VERSION.dup
   spec.authors       = ["Mathias Lafeldt"]
   spec.email         = ["mathias.lafeldt@jimdo.com"]
   spec.summary       = %q{Rake tasks to build Debian packages}
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop", "~> 0.24.1"
+  spec.add_development_dependency "rubocop", "~> 0.45.0"
 end

data/demo/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:jessie
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y \
+        build-essential \
+        curl \
+        devscripts \
+        equivs \
+        git-buildpackage \
+        git \
+        lsb-release \
+        make \
+        openssh-client \
+        pristine-tar \
+        rake \
+        rsync \
+        ruby \
+        ruby-dev \
+        rubygems \
+        wget
+
+RUN echo "gem: --no-ri --no-rdoc" >/etc/gemrc
+RUN gem install fpm -v 1.4.0
+RUN gem install fpm-cookery -v 0.29.0
+RUN gem install buildtasks -v 0.0.1
+RUN gem install bundler -v 1.10.0

data/demo/README.md

@@ -0,0 +1,10 @@
+This demo shows how to use buildtasks and Docker for package building.
+
+```sh
+$ docker-compose build
+$ docker-compose run demo1
+$ docker-compose run demo2
+$ ls -1 pkg/
+periodicnoise_1.1_amd64.deb
+python-pytrac_0.4_all.deb
+```

data/demo/docker-compose.yml

@@ -0,0 +1,15 @@
+demo1:
+  build: .
+  command: rake build publish PUBLISH_DIR=/pkg
+  volumes:
+    - example1:/data
+    - pkg:/pkg
+  working_dir: /data
+
+demo2:
+  build: .
+  command: rake build publish PUBLISH_DIR=/pkg
+  volumes:
+    - example2:/data
+    - pkg:/pkg
+  working_dir: /data

data/demo/example1/Rakefile

@@ -0,0 +1,7 @@
+require "buildtasks"
+
+BuildTasks::GitBuildpackage.define do
+  name    "periodicnoise"
+  version "debian/1.2"
+  source  "https://github.com/Jimdo/periodicnoise"
+end

data/demo/example2/Rakefile

@@ -0,0 +1,3 @@
+require "buildtasks"
+
+BuildTasks::FPMCookery.define

data/demo/example2/recipe.rb

@@ -0,0 +1,8 @@
+class PythonPytrac < FPM::Cookery::PythonRecipe
+  homepage      "https://github.com/Jimdo/pytrac"
+  name          "pytrac"
+  maintainer    "Daniel Bonkowski <bonko@jimdo.com>"
+  build_depends ["python-setuptools"]
+  depends       ["python"]
+  version       "0.4"
+end

data/lib/buildtasks/fpm_cookery/tasks.rb

@@ -21,7 +21,7 @@ module BuildTasks
 
       def validate_attributes
         unless File.exist?(recipe)
-          fail InvalidAttributeError, "recipe file '#{recipe}' not found"
+          raise InvalidAttributeError, "recipe file '#{recipe}' not found"
         end
 
         if File.exist?("Gemfile")
@@ -29,7 +29,7 @@ module BuildTasks
         end
       end
 
-      def define_tasks # rubocop:disable MethodLength
+      def define_tasks # rubocop:disable MethodLength,AbcSize
         task :default => :build
 
         file "Gemfile" do |t|
@@ -49,7 +49,7 @@ module BuildTasks
         desc "Publish built packages"
         task :publish => :build do
           publish_dir = ENV["PUBLISH_DIR"]
-          fail "PUBLISH_DIR variable not set in environment" unless publish_dir
+          raise "PUBLISH_DIR variable not set in environment" unless publish_dir
 
           mkdir_p publish_dir
           cp Dir["pkg/*.deb"], publish_dir

data/lib/buildtasks/git_buildpackage/tasks.rb

@@ -6,7 +6,7 @@ require "forwardable"
 module BuildTasks
   module GitBuildpackage
     class Tasks < ::Rake::TaskLib
-      BUILD_CMD = 'debuild -i\.git -I.git -uc -us -b'
+      BUILD_CMD = 'debuild -i\.git -I.git -uc -us -b'.freeze
 
       include BuildTasks::Mixins::Tasks
 
@@ -27,14 +27,14 @@ module BuildTasks
       end
 
       def validate_attributes
-        fail MissingAttributeError, "name"    unless name
-        fail MissingAttributeError, "version" unless version
-        fail MissingAttributeError, "source"  unless source
+        raise MissingAttributeError, "name"    unless name
+        raise MissingAttributeError, "version" unless version
+        raise MissingAttributeError, "source"  unless source
 
-        patches.each { |p| fail Errno::ENOENT, p unless File.exist?(abspath(p)) }
+        patches.each { |p| raise Errno::ENOENT, p unless File.exist?(abspath(p)) }
       end
 
-      def update_changelog # rubocop:disable MethodLength
+      def update_changelog # rubocop:disable MethodLength,AbcSize
         return unless changelog
 
         text = changelog[:text]
@@ -50,7 +50,7 @@ module BuildTasks
         sh "dch", "--no-auto-nmu", *args
       end
 
-      def define_tasks # rubocop:disable MethodLength
+      def define_tasks # rubocop:disable MethodLength,AbcSize
         task :default => :build
 
         file git_dir do |t|
@@ -77,7 +77,7 @@ module BuildTasks
         task :deps => :patch do
           in_git_dir do
             control_file = "debian/control"
-            fail Errno::ENOENT, control_file unless File.exist?(control_file)
+            raise Errno::ENOENT, control_file unless File.exist?(control_file)
             env = "DEBIAN_FRONTEND=noninteractive"
             sh sudo("#{env} mk-build-deps -i -r -t 'apt-get -y' #{control_file}")
           end
@@ -95,7 +95,7 @@ module BuildTasks
         desc "Publish built packages"
         task :publish => :build do
           publish_dir = ENV["PUBLISH_DIR"]
-          fail "PUBLISH_DIR variable not set in environment" unless publish_dir
+          raise "PUBLISH_DIR variable not set in environment" unless publish_dir
 
           mkdir_p publish_dir
           cp Dir["*.deb"], publish_dir
@@ -109,7 +109,7 @@ module BuildTasks
       end
 
       def git_dir
-        "git-#{version.to_s.gsub("/", "-")}"
+        "git-#{version.to_s.tr('/', '-')}"
       end
 
       def in_git_dir

data/lib/buildtasks/mixins/dsl.rb

@@ -4,7 +4,7 @@ module BuildTasks
       def _validate(symbol, arg, validation)
         kinds = Array(validation.fetch(:kind_of))
         unless kinds.any? { |k| arg.is_a?(k) }
-          fail ArgumentError, "#{symbol} must be of kind #{kinds}"
+          raise ArgumentError, "#{symbol} must be of kind #{kinds}"
         end
       end
 

data/lib/buildtasks/mixins/tasks.rb

@@ -2,7 +2,7 @@ module BuildTasks
   module Mixins
     module Tasks
       def sudo(cmd)
-        return cmd if Process.uid == 0
+        return cmd if Process.uid.zero?
         "sudo " + cmd
       end
     end

data/lib/buildtasks/version.rb

@@ -1,3 +1,3 @@
 module BuildTasks
-  VERSION = "0.0.2"
+  VERSION = "0.0.3".freeze
 end

data/spec/fpm_cookery/dsl_spec.rb

@@ -5,7 +5,7 @@ describe BuildTasks::FPMCookery::DSL do
 
   it "initializes attributes" do
     expect(subject.recipe).to eq "recipe.rb"
-    expect(subject.fpm_cookery_version).to eq "~> 0.25.0"
+    expect(subject.fpm_cookery_version).to eq "~> 0.27.0"
     expect(subject.fpm_version).to eq "~> 1.3.3"
   end
 

data/spec/fpm_cookery/tasks_spec.rb

@@ -19,8 +19,8 @@ describe BuildTasks::FPMCookery::Tasks do
     allow(File).to receive(:exist?).with("Gemfile").and_return(false)
 
     BuildTasks::FPMCookery::Tasks.new(attributes)
-    expect(Rake::Task.task_defined? "build").to be_truthy
-    expect(Rake::Task.task_defined? "publish").to be_truthy
+    expect(Rake::Task.task_defined?("build")).to be_truthy
+    expect(Rake::Task.task_defined?("publish")).to be_truthy
   end
 
   it "creates Gemfile to define gem dependencies" do

data/spec/git_buildpackage/tasks_spec.rb

@@ -14,7 +14,7 @@ describe BuildTasks::GitBuildpackage::Tasks do
     )
 
     BuildTasks::GitBuildpackage::Tasks.new(attributes)
-    expect(Rake::Task.task_defined? "build").to be_truthy
-    expect(Rake::Task.task_defined? "publish").to be_truthy
+    expect(Rake::Task.task_defined?("build")).to be_truthy
+    expect(Rake::Task.task_defined?("publish")).to be_truthy
   end
 end

data/spec/mixins/dsl_spec.rb

@@ -32,7 +32,7 @@ describe BuildTasks::Mixins::DSL do
         expect do
           c.set_or_return(:some_attribute, "some-value", :kind_of => String)
           c.set_or_return(:some_attribute, :some_value, :kind_of => Symbol)
-          c.set_or_return(:some_attribute, 1234, :kind_of => Fixnum)
+          c.set_or_return(:some_attribute, 1234, :kind_of => Integer)
           c.set_or_return(:some_attribute, true, :kind_of => TrueClass)
           c.set_or_return(:some_attribute, false, :kind_of => FalseClass)
           c.set_or_return(:some_attribute, 1, :kind_of => [TrueClass, Integer])

data/spec/mixins/tasks_spec.rb

@@ -10,12 +10,12 @@ describe BuildTasks::Mixins::Tasks do
   describe "#sudo" do
     it "runs command via sudo if not root" do
       allow(Process).to receive(:uid).and_return 1000
-      expect(c.sudo "shutdown -fr").to eq "sudo shutdown -fr"
+      expect(c.sudo("shutdown -fr")).to eq "sudo shutdown -fr"
     end
 
     it "runs command as-is if already root" do
       allow(Process).to receive(:uid).and_return 0
-      expect(c.sudo "shutdown -fr").to eq "shutdown -fr"
+      expect(c.sudo("shutdown -fr")).to eq "shutdown -fr"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildtasks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mathias Lafeldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.45.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.45.0
 description: Rake tasks to build Debian packages
 email:
 - mathias.lafeldt@jimdo.com
@@ -81,6 +81,12 @@ files:
 - README.md
 - Rakefile
 - buildtasks.gemspec
+- demo/Dockerfile
+- demo/README.md
+- demo/docker-compose.yml
+- demo/example1/Rakefile
+- demo/example2/Rakefile
+- demo/example2/recipe.rb
 - lib/buildtasks.rb
 - lib/buildtasks/exceptions.rb
 - lib/buildtasks/fpm_cookery.rb
@@ -118,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to build Debian packages