assemblyline-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f68934ed967fbe3e2783071607e961202aa37af
-  data.tar.gz: 5ee8c14d9830f95b219dd41ff231ae1dd1e27229
+  metadata.gz: f765ed4ed2229592b34a7962e774877a4ba9c316
+  data.tar.gz: 06832c24f99429a6602c7303bb2612cbb2e6c117
 SHA512:
-  metadata.gz: a28a84c2f355b2b4bee49b3fb7a7116aa48d1310991af55dd3667d4e00cc8c2f17bb6e0c24ca197f3f5850b0e82289a54c220662f3bc94f61e1c056f07d1bb7a
-  data.tar.gz: 26a7df5d9f586826388a7f3ca144e9645698575233e8fd500be9cc3f36aab35c0748a7680439c2c53935b21757c75791f2ccf1de8a2409e6efc2f2f6a297d1ae
+  metadata.gz: 4034611a1c3a9dede9f44d0d291f035fb09f2191a7d4fefb6bf4e29f471cdfed2832ee6309ae637f5598358eb8d80d48521ff46269e58ee7e585d17c2b8507da
+  data.tar.gz: eba62fc88f3154dbdb14d828b6ed75a0249eeac947bf09fcd75f518624912b835e7db188fc112cb65437255f4a12e3f1589b9ecaa3f48919a3a2661c6ae40424

data/lib/assemblyline/ruby/installer.rb

@@ -4,28 +4,19 @@ require "assemblyline/ruby/system_packages"
 module Assemblyline
   module Ruby
     class Installer
-      def initialize(provider = nil, system_packages = nil)
+      def initialize(provider = nil)
         @provider = provider || Provider.provider
-        @system_packages = system_packages || SystemPackages.new
-        @base_packages = @provider.current_packages
       end
 
       def install
-        provider.install(system_packages.all) if system_packages.any?
+        provider.install
         yield
-        provider.remove(removable_packages) if system_packages.any?
+        provider.remove
       end
 
       private
 
-      attr_reader :provider, :base_packages, :system_packages
-
-      def removable_packages
-        provider.current_packages -
-          provider.required_packages -
-          system_packages.runtime -
-          base_packages
-      end
+      attr_reader :provider
     end
   end
 end

data/lib/assemblyline/ruby/provider/alpine.rb

@@ -1,17 +1,26 @@
+require "assemblyline/ruby/system_packages"
+
 module Assemblyline
   module Ruby
     module Provider
       class Alpine
-        def current_packages
-          `apk info -s`.split("\n")
+        def initialize(system_packages = SystemPackages.new)
+          @system_packages = system_packages
         end
 
-        def install(packages)
-          fail unless system "apk add --no-cache #{packages.join(" ")}"
+        def install
+          add ".a10e.builddeps", system_packages.all
         end
 
-        def remove(packages)
-          fail unless system "apk del #{packages.join(" ")}"
+        def remove
+          add ".a10e.rundeps", rundeps
+          del ".a10e.builddeps"
+        end
+
+        private
+
+        def rundeps
+          system_packages.runtime + required_packages
         end
 
         def required_packages
@@ -21,6 +30,18 @@ module Assemblyline
             .map { |file| `apk info --installed so:#{file}`.chomp }
             .uniq.sort
         end
+
+        def add(virtual_package, packages)
+          cmd "apk add --no-cache --virtual #{virtual_package} #{packages.join(" ")}"
+        end
+
+        def del(package)
+          cmd "apk del #{package}"
+        end
+
+        def cmd(command)
+          fail unless system command
+        end
       end
     end
   end

data/lib/assemblyline/ruby/version.rb

@@ -1,5 +1,5 @@
 module Assemblyline
   module Ruby
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler