buildizer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ2NDk2ZTA4OTQzYjQzYjYyN2E3NzY2MjFlYzUwZjE2ODI2MTM2Nw==
+    ZmJhNmZhMzlhYzZhZDRjZWYwNTFkZDJhYzU4YjNmMTk3ZjA5MWVhOQ==
   data.tar.gz: !binary |-
-    YzNjNTg2ZWZmNDg2ZjBhNTE3YjQzMTdlMTRiYWQ4ODIyMzk0NjJhMQ==
+    MzZjZTE0MzQ3ODI2YzBkOTc5NzRjOGZhYjdhM2YyYjhhOWFjOWI4Yw==
 SHA512:
   metadata.gz: !binary |-
-    NzdlZDRlN2JhODkwN2U5ZmM5MGYzNGU4NjMzOGJiNGU5Zjc5OWFjMzA1MWI2
-    Zjg5NDQxODVhZGFiZmM5NWYxZWIxODliZTZkNGI1ZTRjM2Q2YTVjZWU4YWQw
-    ZWE1ZWM5NjJjYTVhZGE3N2JiMDEyZDRiYjgwNDIwMDdkYjkzODk=
+    ZThhYTdlZjNmNTdmZDdmNzRhMTVjOGY1M2U3YjY1NzcxZTRhZTMwZDZiNTc2
+    YzZmZDY1NjhlYTI2ZWIzZmEzNTZhZDQ4NDE2M2ZiZmZmYzBkMTJkOGQwNzBj
+    YzA3MTYzMGNhY2I0YzgwOGU2Njc4MWE1OTVhZmE5M2RlYzk1OGY=
   data.tar.gz: !binary |-
-    Yzk4YjIxMmQ2MGI4Y2Q0NDhmYTQ4ZTY4MDJmM2M2N2Y5ZjFkODY1OTczMWQ0
-    ZTVmNjNlODJjMjRmNzAyMWQ3YTZkNGI2NTdlYzYxMjBjMTFiZjk2OTFjZjgy
-    MDQ0ZjQ2NzQwNTlmODhlOTE5ODM5ZWI3MTExZGU4MWI0NzQyMzU=
+    OTIxMGYzZDI0N2JmYmQyZDcwYjdmM2QyNGRjMjg0NzE2NTUzNTJkMDFmY2I2
+    MGQ0NDhlNjlkMWFhNmFhYzMyOTVmZDkxZGUzNTk5NWNiOThkNzA2ZjExNzc2
+    NjZiN2NjOGVhY2U2YjE0MDg3NDAwOWZjYzM0YzAwMTI1NzU5Mzc=

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: https://github.com/flant/shellfold.git
-  revision: 6b76a3438007ae7a01387ce77ed9e41e5517bfb3
+  revision: 51d8ff898ae1afbfb6463ed2e1ed25571cab347c
   specs:
-    shellfold (0.0.1)
+    shellfold (0.0.3)
       mixlib-shellout (>= 2.2.6, < 3.0)
 
 PATH
   remote: .
   specs:
-    buildizer (0.0.5)
+    buildizer (0.0.6)
       net_status (>= 0.0.1, < 1.0)
       package_cloud (>= 0.2, < 1.0)
       shellfold (>= 0.0.1, < 1.0)

data/lib/buildizer/builder/fpm.rb

@@ -22,7 +22,7 @@ module Buildizer
                   "build type is forbidden ",
                   "(use TRAVIS_TAG, CI_BUILD_TAG env variables)",
                 ].join) if params[:package_version]
-          params[:package_version] = ENV['TRAVIS_TAG'] || ENV['CI_BUILD_TAG']
+          params[:package_version] = packager.package_version_tag
           params[:fpm_script] = Array(packager.buildizer_conf['fpm_script'])
           params[:fpm_config_files] = packager.buildizer_conf['fpm_config_files'].to_h
           params[:fpm_files] = packager.buildizer_conf['fpm_files'].to_h

data/lib/buildizer/builder/native.rb

@@ -0,0 +1,23 @@
+module Buildizer
+  module Builder
+    class Native < Base
+      def build_type
+        'native'
+      end
+
+      def target_klass
+        Target::Native
+      end
+
+      def initial_target_params
+        super.tap do |params|
+          params[:package_version] = packager.package_version_tag
+        end
+      end
+
+      def build_instructions(target)
+        target.image.native_build_instructions(self, target)
+      end
+    end # Native
+  end # Builder
+end # Buildizer

data/lib/buildizer/image/base.rb

@@ -51,6 +51,10 @@ module Buildizer
       def instruction(instruction, cmd)
         instructions << [instruction.to_s.upcase, cmd].join(' ')
       end
+
+      def native_build_instructions(builder, target)
+        raise
+      end
     end # Base
   end # Image
 end # Buildizer

data/lib/buildizer/image/centos.rb

@@ -47,6 +47,25 @@ module Buildizer
 
         instruction :RUN, "bash -lec \"echo -e '#{repo}' >> /etc/yum.repos.d/CentOS-Extra-Buildizer.repo\""
       end
+
+      def native_build_instructions(builder, target)
+        version, release = target.package_version.split('-')
+        source_name = "#{target.package_name}-#{version}"
+        source_archive_path = Pathname.new('/package.tar.gz')
+        target_spec_name = "#{target.package_name}.spec"
+
+        ["cp -r #{builder.docker.container_package_path} /tmp/#{source_name}",
+         "cd /tmp",
+         "tar -zcvf #{source_archive_path} #{source_name}",
+         "ln -fs #{builder.docker.container_build_path} ~/rpmbuild",
+         "rpmdev-setuptree",
+         "cp #{source_archive_path} ~/rpmbuild/SOURCES",
+         "cp #{builder.docker.container_package_path.join(target_spec_name)} ~/rpmbuild/SPECS",
+         "cd ~/rpmbuild/SPECS",
+         "rpmbuild -ba #{target_spec_name}",
+         "cp $(find #{builder.docker.container_build_path.join('RPMS')} -name '*.rpm') #{builder.docker.container_build_path}",
+        ]
+      end
     end # Centos
   end # Image
 end # Buildizer

data/lib/buildizer/image/ubuntu.rb

@@ -20,6 +20,10 @@ module Buildizer
         os_codename
       end
 
+      def build_dep(build_dep)
+        instruction :RUN, "apt-get build-dep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
+      end
+
       def fpm_output_type
         'deb'
       end
@@ -30,10 +34,6 @@ module Buildizer
           res << '--deb-no-default-config-files'
         end
       end
-
-      def build_dep(build_dep)
-        instruction :RUN, "apt-get build-dep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
-      end
     end # Ubuntu
   end # Image
 end # Buildizer

data/lib/buildizer/packager.rb

@@ -54,7 +54,7 @@ module Buildizer
     end
 
     def buildizer_conf
-      @buildizer_conf ||= YAML.load(buildizer_conf_path.read)
+      @buildizer_conf ||= (YAML.load((buildizer_conf_path.read rescue "")) || {})
     end
 
     def options
@@ -155,6 +155,10 @@ git add -v .travis.yml
       buildizer_conf['package_version']
     end
 
+    def package_version_tag
+      ENV['TRAVIS_TAG'] || ENV['CI_BUILD_TAG']
+    end
+
     def os_params(os)
       buildizer_conf['os'].to_h[os.to_s].to_h
     end
@@ -226,7 +230,9 @@ git add -v .travis.yml
     def builder
       @builder ||= begin
         build_type = buildizer_conf['build_type']
-        klass = {'fpm' => Builder::Fpm}[build_type]
+        raise Error, error: :input_error, message: "no build_type given" unless build_type
+        klass = {fpm: Builder::Fpm,
+                 native: Builder::Native}[build_type.to_s.to_sym]
         raise Error, error: :input_error, message: "unknown build_type '#{build_type}'" unless klass
         klass.new(self)
       end

data/lib/buildizer/target/native.rb

@@ -0,0 +1,6 @@
+module Buildizer
+  module Target
+    class Native < Base
+    end # Native
+  end # Target
+end # Buildizer

data/lib/buildizer/version.rb

@@ -1,3 +1,3 @@
 module Buildizer
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/buildizer.rb

@@ -13,9 +13,11 @@ require 'buildizer/packager'
 require 'buildizer/target'
 require 'buildizer/target/base'
 require 'buildizer/target/fpm'
+require 'buildizer/target/native'
 require 'buildizer/builder'
 require 'buildizer/builder/base'
 require 'buildizer/builder/fpm'
+require 'buildizer/builder/native'
 require 'buildizer/image'
 require 'buildizer/image/base'
 require 'buildizer/image/centos'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildizer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - flant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -222,6 +222,7 @@ files:
 - lib/buildizer/builder.rb
 - lib/buildizer/builder/base.rb
 - lib/buildizer/builder/fpm.rb
+- lib/buildizer/builder/native.rb
 - lib/buildizer/cli.rb
 - lib/buildizer/docker.rb
 - lib/buildizer/error.rb
@@ -238,6 +239,7 @@ files:
 - lib/buildizer/target.rb
 - lib/buildizer/target/base.rb
 - lib/buildizer/target/fpm.rb
+- lib/buildizer/target/native.rb
 - lib/buildizer/version.rb
 homepage: https://github.com/flant/buildizer
 licenses: