buildizer 0.1.0 → 0.1.1

data/lib/buildizer/target/fpm.rb

@@ -3,30 +3,20 @@ module Buildizer
     class Fpm < Base
       include PackageNameMod
 
-      attr_reader :fpm_script
-      attr_reader :fpm_config_files
-      attr_reader :fpm_files
-      attr_reader :fpm_conflicts
-      attr_reader :fpm_replaces
-      attr_reader :fpm_provides
-      attr_reader :fpm_depends
-      attr_reader :fpm_description
-      attr_reader :fpm_url
-
-      def initialize(builder, image,
+      def initialize(builder, os,
                      fpm_script: [], fpm_config_files: {}, fpm_files: {},
                      fpm_conflicts: [], fpm_replaces: {}, fpm_provides: [],
                      fpm_depends: [], fpm_description: nil, fpm_url: nil, **kwargs, &blk)
-        super(builder, image, **kwargs) do
-          @fpm_script = fpm_script
-          @fpm_config_files = fpm_config_files
-          @fpm_files = fpm_files
-          @fpm_conflicts = fpm_conflicts
-          @fpm_replaces = fpm_replaces
-          @fpm_provides = fpm_provides
-          @fpm_depends = fpm_depends
-          @fpm_description = fpm_description
-          @fpm_url = fpm_url
+        super(builder, os, **kwargs) do
+          params[:fpm_script] = fpm_script
+          params[:fpm_config_files] = fpm_config_files
+          params[:fpm_files] = fpm_files
+          params[:fpm_conflicts] = fpm_conflicts
+          params[:fpm_replaces] = fpm_replaces
+          params[:fpm_provides] = fpm_provides
+          params[:fpm_depends] = fpm_depends
+          params[:fpm_description] = fpm_description
+          params[:fpm_url] = fpm_url
 
           yield if block_given?
         end

data/lib/buildizer/target/patch.rb

@@ -1,20 +1,17 @@
 module Buildizer
   module Target
     class Patch < Base
-      attr_reader :patch
-      attr_reader :patch_version
-
-      def initialize(builder, image, patch: [], patch_version: nil, **kwargs, &blk)
-        super(builder, image, **kwargs) do
-          @patch = patch
-          @patch_version = patch_version
+      def initialize(builder, os, patch: [], patch_version: nil, **kwargs, &blk)
+        super(builder, os, **kwargs) do
+          params[:patch] = patch
+          params[:patch_version] = patch_version
 
           yield if block_given?
         end
       end
 
       def patch_version
-        @patch_version.nil? ? nil : @patch_version.to_s
+        params[:patch_version].nil? ? nil : params[:patch_version].to_s
       end
 
       def image_work_path

data/lib/buildizer/version.rb

@@ -1,3 +1,3 @@
 module Buildizer
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - flant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -291,14 +291,15 @@ files:
 - lib/buildizer/docker.rb
 - lib/buildizer/error.rb
 - lib/buildizer/image.rb
-- lib/buildizer/image/base.rb
-- lib/buildizer/image/centos.rb
-- lib/buildizer/image/centos6.rb
-- lib/buildizer/image/centos7.rb
-- lib/buildizer/image/ubuntu.rb
-- lib/buildizer/image/ubuntu1204.rb
-- lib/buildizer/image/ubuntu1404.rb
-- lib/buildizer/image/ubuntu1604.rb
+- lib/buildizer/os.rb
+- lib/buildizer/os/base.rb
+- lib/buildizer/os/centos.rb
+- lib/buildizer/os/centos6.rb
+- lib/buildizer/os/centos7.rb
+- lib/buildizer/os/ubuntu.rb
+- lib/buildizer/os/ubuntu1204.rb
+- lib/buildizer/os/ubuntu1404.rb
+- lib/buildizer/os/ubuntu1604.rb
 - lib/buildizer/target.rb
 - lib/buildizer/target/base.rb
 - lib/buildizer/target/fpm.rb
@@ -318,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.2.1
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='

data/lib/buildizer/image/base.rb

@@ -1,76 +0,0 @@
-module Buildizer
-  module Image
-    class Base
-      attr_reader :instructions
-      attr_reader :docker
-
-      attr_accessor :target
-
-      def initialize(docker, **kwargs)
-        @instructions = []
-        @docker = docker
-
-        instruction :FROM, base_image
-      end
-
-      def os_name
-        raise
-      end
-
-      def os_package_cloud_name
-        os_name
-      end
-
-      def os_package_cloud_version
-        os_version
-      end
-
-      def os_version
-        raise
-      end
-
-      def fpm_output_type
-        raise
-      end
-
-      def fpm_extra_params
-      end
-
-      def build_dep(build_dep)
-        raise
-      end
-
-      def base_image
-        "buildizer/#{os_name}:#{os_version}"
-      end
-
-      def name
-        target.docker_image
-      end
-
-      def cache_name
-        target.docker_cache_image
-      end
-
-      def instruction(instruction, cmd)
-        instructions << [instruction.to_s.upcase, cmd].join(' ')
-      end
-
-      def patch_build_dep(builder, target)
-        target_package_spec(target)
-      end
-
-      def native_build_instructions(builder, target)
-        raise
-      end
-
-      def patch_build_instructions(builder, target)
-        raise
-      end
-
-      def target_package_spec(target)
-        raise
-      end
-    end # Base
-  end # Image
-end # Buildizer