sle2docker 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003b2cf7fe50c4f0c0343c9001871408ca40250b
-  data.tar.gz: 2bcebb608864099eb53090dfed2e27a5299acafc
+  metadata.gz: c12ca51c3ec19bc47d2f727a395123d06c18a1df
+  data.tar.gz: 39e0763011fe5c1bfc8ef1bb5069ab4bb461d121
 SHA512:
-  metadata.gz: 955c42a3fef64be6211b2475866f88e1818df042a86d14b9ef8655b9d8935ba3c57e62c7881ac64d8fb71d09d5e9062844749475b5304b84561efeb537697274
-  data.tar.gz: 8d9f18f7cc45828eae8354256efd26cab5501eee63a2d90e68b14b835ee11201fbb94ad989a76416fc38f3b52597f487f5d13c4e3559680e9504986674e339c2
+  metadata.gz: f8a0761f532912585ed7dc09e32922b7c5646fbbc38cc1b1a1b057658048993a8e14f5e75b68da2dee47e32be2d5fd74ccbad34886ef1032e3edb11348b9dc5c
+  data.tar.gz: 1a7880b5a9d09d8510ee7cd39c6b153d1785a33683873c642936c13e950e1c27291f291e7b0eedaf3e3e3e594bec59648b57fa902cd0354a155d48c1c37598b2

data/.gitignore

@@ -2,3 +2,4 @@ pkg
 Vagrantfile
 package/sle2docker.8
 package/sle2docker.8.html
+sle2docker-*.gem

data/.rubocop.yml

@@ -3,3 +3,5 @@ AllCops:
     - Vagrantfile
     - sle2docker.gemspec
     - lib/templates/**/*
+Metrics/MethodLength:
+  Max: 15

data/.travis.yml

@@ -1,6 +1,13 @@
 language: ruby
+sudo: false
 rvm:
-- 2.1.2
+  - 2.1.2
+before_install:
+  - gem install bundler
+script:
+  - bundle exec rake test
+  - bundle exec rubocop -V
+  - bundle exec rubocop -F
 addons:
   code_climate:
     repo_token:

data/Changelog

@@ -1,3 +1,15 @@
+Wed Oct 05 11:05:30 CET 2016  Miquel Sabaté <msabate@suse.com>
+
+	* Version 0.5.0:
+		- Added the --all option to the activate command. With this
+		  options you can tell sle2docker to activate all the
+		  available images (see 43558fdcc9a4bc2f66f01ea8e5d9d2734722d0a6).
+		- Added the --tag_with_build flag to include the obs build
+		  number of kiwi generated images in the docker tag
+		  (see d577bab99b427de339b91182e708eaaab8d9ae87).
+		- Clarified error message on missing Docker images
+		  (see 591ac6c1aa60b089f6a09d608004514a59614882).
+
 Tue Nov 10 17:58:30 CET 2015  Flavio Castelli <fcastelli@suse.com>
 
 	* Version 0.4.2:

data/lib/sle2docker.rb

@@ -9,5 +9,7 @@ require 'tmpdir'
 
 require_relative 'sle2docker/cli'
 require_relative 'sle2docker/exceptions'
-require_relative 'sle2docker/prebuilt_image'
+require_relative 'sle2docker/image'
+require_relative 'sle2docker/rootfs_image'
+require_relative 'sle2docker/native_image'
 require_relative 'sle2docker/version'

data/lib/sle2docker/cli.rb

@@ -1,32 +1,45 @@
 module Sle2Docker
   # Entry point of the command line interface
   class Cli < Thor
+    check_unknown_options!
+
     desc 'list', 'List available pre-built images'
     def list
       puts 'Available pre-built images:'
-      prebuilt_images = PrebuiltImage.list
-      if prebuilt_images.empty?
+      images = RootFSImage.list + NativeImage.list
+      if images.empty?
         puts 'No pre-built image found.'
         puts "\nPre-built images can be installed from SLE12 Update " \
           'repository using zypper:'
         puts '  zypper install \"sle*-docker-image\"'
       else
-        prebuilt_images.each { |image| puts " - #{image}" }
+        images.each { |image| puts " - #{image}" }
       end
     end
 
     desc 'activate IMAGE_NAME', 'Activate a pre-built image'
-    def activate(image_name)
-      ensure_can_access_dockerd
+    method_option :all,
+                  desc:    'Activate all the available pre-built images',
+                  type:    :boolean,
+                  default: false,
+                  aliases: '-a'
 
-      prebuilt_image = Sle2Docker::PrebuiltImage.new(image_name, options)
-      if prebuilt_image.activated?
-        warn 'Image has already been activated. Exiting'
-        exit(0)
-      end
+    method_option :tag_with_build,
+                  desc:    'Include kiwi build number into tag',
+                  type:    :boolean,
+                  default: false,
+                  aliases: '-b'
 
-      prebuilt_image.activate
-      puts "#{prebuilt_image.image_id} activated"
+    def activate(image_name = nil)
+      ensure_can_access_dockerd
+      if options['all']
+        activate_all(options)
+      elsif !image_name.nil?
+        activate_image(image_name, options)
+      else
+        puts 'You have to specify an image name.'
+        exit 1
+      end
     end
 
     map '-v' => :version
@@ -37,10 +50,38 @@ module Sle2Docker
 
     private
 
+    def activate_all(options)
+      images = RootFSImage
+               .list.map { |img| Sle2Docker::RootFSImage.new(img, options) }
+      images += NativeImage
+                .list.map { |img| Sle2Docker::NativeImage.new(img, options) }
+      activate_images(images)
+    end
+
+    def activate_image(image_name, options)
+      if RootFSImage.list.include?(image_name)
+        activate_images([Sle2Docker::RootFSImage.new(image_name, options)])
+      elsif NativeImage.list.include?(image_name)
+        activate_images([Sle2Docker::NativeImage.new(image_name, options)])
+      else
+        puts 'You have to specify an existing image name.'
+        exit 1
+      end
+    end
+
     def ensure_can_access_dockerd
-      output = `docker info`
-      if $CHILD_STATUS.exitstatus != 0
-        raise output
+      output = `docker info 2>&1`
+      raise output if $CHILD_STATUS.exitstatus.nonzero?
+    end
+
+    def activate_images(images)
+      images.each do |image|
+        if image.activated?
+          warn "Image '#{image.image_id}' has already been activated."
+        else
+          image.activate
+          puts "#{image.image_id} activated"
+        end
       end
     end
   end

data/lib/sle2docker/exceptions.rb

@@ -5,12 +5,12 @@ module Sle2Docker
   class ConfigNotFoundError < RuntimeError
   end
 
-  class PrebuiltImageNotFoundError < RuntimeError
+  class ImageNotFoundError < RuntimeError
   end
 
   class DockerTagError < RuntimeError
   end
 
-  class PrebuiltImageVerificationError < RuntimeError
+  class ImageVerificationError < RuntimeError
   end
 end

data/lib/sle2docker/image.rb

@@ -0,0 +1,43 @@
+module Sle2Docker
+  # This class is the base class of native and prebulid images for
+  # SUSE Linux Enterprise
+  class Image
+    attr_reader :image_id
+
+    def activated?
+      Docker::Image.exist?(image_id)
+    end
+
+    def verify_image
+      check_image_exists
+
+      puts 'Verifying integrity of the pre-built image'
+      package_name = rpm_package_name
+      verification = `rpm --verify #{package_name}`
+      if $CHILD_STATUS.exitstatus.nonzero?
+        raise(ImageVerificationError,
+              "Verification of #{package_name} failed: #{verification}")
+      end
+      true
+    end
+
+    def rpm_package_name
+      image_file = File.join(self.class::IMAGES_DIR, "#{@image_name}.tar.xz")
+      package_name = `rpm -qf #{image_file}`
+      if $CHILD_STATUS.exitstatus.nonzero?
+        raise(
+          ImageVerificationError,
+          "Cannot find rpm package providing #{file}: #{package_name}"
+        )
+      end
+      package_name
+    end
+
+    def check_image_exists
+      msg = "Cannot find pre-built image #{@image_name}"
+      raise(ImageNotFoundError, msg) unless File.exist? File.join(
+        self.class::IMAGES_DIR, "#{@image_name}.tar.xz"
+      )
+    end
+  end
+end

data/lib/sle2docker/native_image.rb

@@ -0,0 +1,62 @@
+module Sle2Docker
+  # This class takes care of handling the native loadable images for
+  # SUSE Linux Enterprise
+  class NativeImage < Image
+    IMAGES_DIR = '/usr/share/suse-docker-images/native'.freeze
+
+    def self.list
+      if File.exist?(NativeImage::IMAGES_DIR)
+        Dir[File.join(NativeImage::IMAGES_DIR, '*.tar.xz')].map do |image|
+          File.basename(image, '.tar.xz')
+        end
+      else
+        []
+      end
+    end
+
+    def initialize(image_name, options)
+      @image_name = image_name
+      @options = options
+      compute_metadata_file
+    end
+
+    def activate
+      verify_image
+
+      puts 'Loading image'
+      Docker::Image.load(File.join(IMAGES_DIR, "#{@image_name}.tar.xz"))
+      image = Docker::Image.get(@image_id)
+      image.tag('repo' => @repository, 'tag' => 'latest')
+      @options['tag_with_build'] &&
+        image.tag('repo' => @repository, 'tag' => "#{@tag}-#{@build}")
+    end
+
+    private
+
+    def compute_metadata_file
+      # example of image name and metadata file:
+      # kiwi >= 8.30
+      #      sles12sp3-container.x86_64-2.0.1-Build2.3.docker (image basename)
+      #      sles12sp3-container.x86_64-2.0.1.metadata
+      regexp = /(?<metadata_file>.*\d+\.\d+\.\d+)
+        (-Build(?<build>\d+\.\d+)\.docker)?/x
+      match = regexp.match(@image_name)
+      match.nil? &&
+        raise(DockerTagError,
+              "Docker image #{@image_name} not found. \
+               Run sle2docker list to check which docker images are available.")
+      @metadata     = parse_metadata_file("#{match['metadata_file']}.metadata")
+      @repository   = @metadata['image']['name']
+      @tag          = @metadata['image']['tags'][0]
+      @build        = match['build']
+      @image_id     = "#{@repository}:#{@tag}"
+    end
+
+    def parse_metadata_file(metadata)
+      file = File.read(
+        File.join(NativeImage::IMAGES_DIR, metadata)
+      )
+      JSON.parse(file)
+    end
+  end
+end

data/lib/sle2docker/rootfs_image.rb

@@ -0,0 +1,85 @@
+module Sle2Docker
+  # This class takes care of handling the pre-build images for
+  # SUSE Linux Enterprise
+  class RootFSImage < Image
+    IMAGES_DIR = '/usr/share/suse-docker-images'.freeze
+    DOCKERFILE_TEMPLATE = File.join(
+      File.expand_path('../../templates/docker_build', __FILE__),
+      'dockerfile.erb'
+    )
+
+    def self.list
+      if File.exist?(RootFSImage::IMAGES_DIR)
+        Dir[File.join(RootFSImage::IMAGES_DIR, '*.tar.xz')].map do |image|
+          File.basename(image, '.tar.xz')
+        end
+      else
+        []
+      end
+    end
+
+    def initialize(image_name, options)
+      @image_name = image_name
+      @options    = options
+      compute_repository_and_tag
+    end
+
+    def activate
+      verify_image
+
+      tmp_dir = prepare_docker_build_root
+      puts 'Activating image'
+      image = Docker::Image.build_from_dir(tmp_dir)
+      image.tag('repo' => @repository, 'tag' => @tag)
+      image.tag('repo' => @repository, 'tag' => 'latest')
+    ensure
+      FileUtils.rm_rf(tmp_dir) if tmp_dir && File.exist?(tmp_dir)
+    end
+
+    def prepare_docker_build_root
+      tmp_dir = Dir.mktmpdir("sle2docker-#{@image_name}-dockerfile")
+
+      create_dockerfile(tmp_dir)
+      copy_prebuilt_image(tmp_dir)
+      tmp_dir
+    end
+
+    def create_dockerfile(tmp_dir)
+      prebuilt_image = @image_name + '.tar.xz'
+      template = ERB.new(File.read(DOCKERFILE_TEMPLATE), nil, '<>')
+                    .result(binding)
+
+      File.open(File.join(tmp_dir, 'Dockerfile'), 'w') do |file|
+        file.write(template)
+      end
+    end
+
+    def copy_prebuilt_image(tmp_dir)
+      prebuilt_image = File.join(IMAGES_DIR, "#{@image_name}.tar.xz")
+      destination = File.join(tmp_dir, "#{@image_name}.tar.xz")
+      FileUtils.cp(prebuilt_image, destination)
+    end
+
+    private
+
+    def compute_repository_and_tag
+      # example of image name:
+      # kiwi < 8.0 :
+      #      sles12-docker.x86_64-1.0.0-Build7.2
+      # kiwi >= 8.0
+      #      obs-source-service.x86_64-1.0.0-Build3.1.docker
+      regexp = /\A(?<name>.*)(-docker)?\..*-(?<version>\d+\.\d+\.\d+)
+       (-Build(?<build>\d+\.\d+)?)?/x
+      match = regexp.match(@image_name)
+      match.nil? &&
+        raise(DockerTagError,
+              "Docker image #{@image_name} not found. \
+               Run sle2docker list to check which docker images are available.")
+
+      @repository = "suse/#{match['name']}"
+      @tag        = match['version']
+      @options['tag_with_build'] && @tag << '-' + (match['build'] || '0.0')
+      @image_id = "#{@repository}:#{@tag}"
+    end
+  end
+end

data/lib/sle2docker/version.rb

@@ -1,5 +1,3 @@
-# rubocop:disable Style/Documentation
-
 module Sle2Docker
-  VERSION = '0.4.2'
+  VERSION = '0.5.1'.freeze
 end

data/package/sle2docker.8.ronn

@@ -39,6 +39,10 @@ To activate the pre-built image use the following command:
 
 `sle2docker activate IMAGE_NAME`
 
+To activate all the available pre-built images use the following command:
+
+`sle2docker activate --all` or `sle2docker activate -a`
+
 ## Customizing the images
 
 To create custom Docker images based on the official ones use

data/sle2docker.gemspec

@@ -29,6 +29,7 @@ EOD
 
   s.add_runtime_dependency 'docker-api'
   s.add_runtime_dependency 'thor'
+  s.add_runtime_dependency 'json'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'fakefs'
   s.add_development_dependency 'minitest'

data/test/command_test.rb

@@ -0,0 +1,15 @@
+require_relative 'test_helper'
+
+class CommandTest < MiniTest::Test
+  describe 'Wrong flag' do
+    it 'returns the proper name of the given flag' do
+      argv = ['--flag']
+      out, err = capture_io do
+        Sle2Docker::Cli.start(argv)
+      end
+
+      assert out.empty?
+      assert_equal "Unknown switches '--flag'\n", err
+    end
+  end
+end

data/test/native_image_test.rb

@@ -0,0 +1,98 @@
+require_relative 'test_helper'
+
+# rubocop:disable Metrics/BlockLength
+class NativeImageTest < MiniTest::Test
+  describe 'NativeImage' do
+    after do
+      FakeFS::FileSystem.clear
+    end
+
+    describe 'listing' do
+      it 'works when no pre-built image is available' do
+        actual = Sle2Docker::NativeImage.list
+        expected = []
+        assert_equal expected, actual
+      end
+
+      it 'lists the names of the available images' do
+        FakeFS do
+          expected = [
+            'sles11sp3-docker.x86_64-1.0.0-Build1.3',
+            'sles12-docker.x86_64-1.0.0-Build7.2'
+          ]
+
+          FileUtils.mkdir_p(Sle2Docker::NativeImage::IMAGES_DIR)
+          expected.each do |image|
+            FileUtils.touch(
+              File.join(
+                Sle2Docker::NativeImage::IMAGES_DIR,
+                "#{image}.tar.xz"
+              )
+            )
+          end
+
+          actual = Sle2Docker::NativeImage.list
+          assert_equal expected, actual
+        end
+      end
+    end
+  end
+end
+
+class NativeImageTest < MiniTest::Test
+  describe 'NativeImage' do
+    before do
+      @options = { tag_with_build: false }
+    end
+
+    describe 'activation' do
+      it 'triggers docker load' do
+        image_file = '/usr/share/suse-docker-images/native/'\
+                     'sles12sp3-container.x86_64-2.0.1-Build2.3.docker.tar.xz'
+        File.stubs(:exist?).returns(false)
+        File.stubs(:exist?).with(image_file).returns(true)
+        Docker::Image.expects(:load).with(image_file).once.returns(true)
+        File.stubs(:read).returns(
+          '{"image": {"name": "repo", "tags": ["tag1","tag2"]}}'
+        )
+        mocked_image = mock
+        mocked_image.expects(:tag)
+                    .with('repo' => 'repo', 'tag' => 'latest')
+                    .once
+        Docker::Image.expects(:get).with('repo:tag1').once.returns(mocked_image)
+        native_image = Sle2Docker::NativeImage.new(
+          'sles12sp3-container.x86_64-2.0.1-Build2.3.docker',
+          @options
+        )
+        native_image.expects(:verify_image).once
+        native_image.activate
+      end
+
+      it 'triggers docker load and tags with build' do
+        @options['tag_with_build'] = true
+        image_file = '/usr/share/suse-docker-images/native/'\
+                     'sles12sp3-container.x86_64-2.0.1-Build2.3.docker.tar.xz'
+        File.stubs(:exist?).returns(false)
+        File.stubs(:exist?).with(image_file).returns(true)
+        Docker::Image.expects(:load).with(image_file).once.returns(true)
+        File.stubs(:read).returns(
+          '{"image": {"name": "repo", "tags": ["tag1","tag2"]}}'
+        )
+        mocked_image = mock
+        mocked_image.expects(:tag)
+                    .with('repo' => 'repo', 'tag' => 'latest')
+                    .once
+        mocked_image.expects(:tag)
+                    .with('repo' => 'repo', 'tag' => 'tag1-2.3')
+                    .once
+        Docker::Image.expects(:get).with('repo:tag1').once.returns(mocked_image)
+        native_image = Sle2Docker::NativeImage.new(
+          'sles12sp3-container.x86_64-2.0.1-Build2.3.docker',
+          @options
+        )
+        native_image.expects(:verify_image).once
+        native_image.activate
+      end
+    end
+  end
+end

data/test/rootfs_image_test.rb

@@ -0,0 +1,158 @@
+require_relative 'test_helper'
+
+# rubocop:disable Metrics/LineLength, Metrics/BlockLength
+class RootFSImageTest < MiniTest::Test
+  describe 'RootFSImage' do
+    before do
+      @options = { password: '', tag_with_build: false }
+    end
+
+    after do
+      FakeFS::FileSystem.clear
+    end
+
+    describe 'listing' do
+      it 'works when no pre-built image is available' do
+        actual = Sle2Docker::RootFSImage.list
+        expected = []
+        assert_equal expected, actual
+      end
+
+      it 'lists the names of the available images' do
+        FakeFS do
+          expected = [
+            'sles11sp3-docker.x86_64-1.0.0-Build1.3',
+            'sles12-docker.x86_64-1.0.0-Build7.2'
+          ]
+
+          FileUtils.mkdir_p(Sle2Docker::RootFSImage::IMAGES_DIR)
+          expected.each do |image|
+            FileUtils.touch(
+              File.join(
+                Sle2Docker::RootFSImage::IMAGES_DIR,
+                "#{image}.tar.xz"
+              )
+            )
+          end
+
+          actual = Sle2Docker::RootFSImage.list
+          assert_equal expected, actual
+        end
+      end
+    end
+  end
+end
+
+# rubocop:disable Style/IndentHeredoc
+class RootFSImageTest < MiniTest::Test
+  describe 'RootFSImage' do
+    before do
+      @options = { password: '', tag_with_build: false }
+    end
+
+    after do
+      FakeFS::FileSystem.clear
+    end
+
+    describe 'activation' do
+      it 'creates a Dockerfile and builds the image' do
+        begin
+          image = 'sles12-docker.x86_64-1.0.0-Build7.2'
+          prebuilt_image = Sle2Docker::RootFSImage.new(image, @options)
+          expected = <<DOCKERFILE
+FROM scratch
+MAINTAINER "Flavio Castelli <fcastelli@suse.com>"
+
+ADD sles12-docker.x86_64-1.0.0-Build7.2.tar.xz /
+DOCKERFILE
+
+          tmp_dir = Dir.mktmpdir('sle2docker-test')
+          prebuilt_image.create_dockerfile(tmp_dir)
+          dockerfile = File.join(tmp_dir, 'Dockerfile')
+
+          assert File.exist?(dockerfile)
+          assert_equal(expected, File.read(dockerfile))
+        ensure
+          FileUtils.rm_rf(tmp_dir) if tmp_dir && File.exist?(tmp_dir)
+        end
+      end
+
+      it 'triggers docker build' do
+        File.stubs(:exist?).returns(true)
+        tmp_dir = '/foo'
+        mocked_image = mock
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => '1.0.0')
+                    .once
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => 'latest')
+                    .once
+
+        prebuilt_image = Sle2Docker::RootFSImage.new(
+          'sles12-docker.x86_64-1.0.0-Build7.2',
+          @options
+        )
+        img_file = File.join(
+          Sle2Docker::RootFSImage::IMAGES_DIR,
+          'sles12-docker.x86_64-1.0.0-Build7.2.tar.xz'
+        )
+        prebuilt_image.expects(:prepare_docker_build_root).once.returns(tmp_dir)
+        prebuilt_image.expects(:`).with("rpm -qf #{img_file}")
+                      .once.returns('sles12-docker')
+        prebuilt_image.expects(:`).with('rpm --verify sles12-docker').once
+        Docker::Image.expects(:build_from_dir).with(tmp_dir).once.returns(mocked_image)
+        FileUtils.expects(:rm_rf).with(tmp_dir).once
+
+        prebuilt_image.activate
+      end
+
+      it 'triggers docker build and tags with build #' do
+        @options['tag_with_build'] = true
+        File.stubs(:exist?).returns(true)
+        tmp_dir = '/foo'
+        mocked_image = mock
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => '1.0.0-7.2')
+                    .once
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => 'latest')
+                    .once
+
+        prebuilt_image = Sle2Docker::RootFSImage.new(
+          'sles12-docker.x86_64-1.0.0-Build7.2',
+          @options
+        )
+        prebuilt_image.expects(:prepare_docker_build_root).once.returns(tmp_dir)
+        prebuilt_image.expects(:verify_image).once
+        Docker::Image.expects(:build_from_dir).with(tmp_dir).once.returns(mocked_image)
+        FileUtils.expects(:rm_rf).with(tmp_dir).once
+
+        prebuilt_image.activate
+      end
+
+      it 'triggers docker build and tags with build# (build# empty)' do
+        @options['tag_with_build'] = true
+        File.stubs(:exist?).returns(true)
+        tmp_dir = '/foo'
+        mocked_image = mock
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => '1.0.0-0.0')
+                    .once
+        mocked_image.expects(:tag)
+                    .with('repo' => 'suse/sles12-docker', 'tag' => 'latest')
+                    .once
+
+        prebuilt_image = Sle2Docker::RootFSImage.new(
+          'sles12-docker.x86_64-1.0.0-Build',
+          @options
+        )
+        prebuilt_image.expects(:prepare_docker_build_root).once.returns(tmp_dir)
+        prebuilt_image.expects(:verify_image).once
+        Docker::Image.expects(:build_from_dir).with(tmp_dir).once.returns(mocked_image)
+        FileUtils.expects(:rm_rf).with(tmp_dir).once
+
+        prebuilt_image.activate
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require File.expand_path('../../lib/sle2docker', __FILE__)
 
@@ -7,8 +7,7 @@ require 'minitest/autorun'
 require 'stringio'
 require 'fakefs/safe'
 
-# rubocop:disable Style/Documentation, Lint/Eval
-
+# rubocop:disable Security/Eval
 class Object
   def capture(stream)
     begin
@@ -22,6 +21,7 @@ class Object
     result
   end
 end
+# rubocop:enable Security/Eval
 
 module MiniTest
   class Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sle2docker
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Flavio Castelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +194,16 @@ files:
 - lib/sle2docker.rb
 - lib/sle2docker/cli.rb
 - lib/sle2docker/exceptions.rb
-- lib/sle2docker/prebuilt_image.rb
+- lib/sle2docker/image.rb
+- lib/sle2docker/native_image.rb
+- lib/sle2docker/rootfs_image.rb
 - lib/sle2docker/version.rb
 - lib/templates/docker_build/dockerfile.erb
 - package/sle2docker.8.ronn
 - sle2docker.gemspec
-- test/prebuilt_image_test.rb
+- test/command_test.rb
+- test/native_image_test.rb
+- test/rootfs_image_test.rb
 - test/test_helper.rb
 homepage: https://github.com/SUSE/sle2docker
 licenses:

data/lib/sle2docker/prebuilt_image.rb

@@ -1,114 +0,0 @@
-module Sle2Docker
-  # This class takes care of handling the pre-build images for
-  # SUSE Linux Enterprise
-  class PrebuiltImage
-    IMAGES_DIR = '/usr/share/suse-docker-images'
-    DOCKERFILE_TEMPLATE = File.join(
-      File.expand_path('../../templates/docker_build', __FILE__),
-      'dockerfile.erb')
-
-    attr_reader :image_id
-
-    def self.list
-      if File.exist?(PrebuiltImage::IMAGES_DIR)
-        Dir[File.join(IMAGES_DIR, '*.tar.xz')].map do |image|
-          File.basename(image, '.tar.xz')
-        end
-      else
-        []
-      end
-    end
-
-    def initialize(image_name, options)
-      @image_name = image_name
-      @options    = options
-      compute_repository_and_tag
-    end
-
-    def activated?
-      Docker::Image.exist?(image_id)
-    end
-
-    def activate
-      unless File.exist?(File.join(IMAGES_DIR, "#{@image_name}.tar.xz"))
-        fail PrebuiltImageNotFoundError,
-             "Cannot find pre-built image #{@image_name}"
-      end
-
-      verify_image
-
-      tmp_dir = prepare_docker_build_root
-      puts 'Activating image'
-      image = Docker::Image.build_from_dir(tmp_dir)
-      image.tag('repo' =>  @repository, 'tag' => @tag)
-      image.tag('repo' =>  @repository, 'tag' => 'latest')
-    ensure
-      FileUtils.rm_rf(tmp_dir) if tmp_dir && File.exist?(tmp_dir)
-    end
-
-    def prepare_docker_build_root
-      tmp_dir = Dir.mktmpdir("sle2docker-#{@image_name}-dockerfile")
-
-      create_dockerfile(tmp_dir)
-      copy_prebuilt_image(tmp_dir)
-      tmp_dir
-    end
-
-    # rubocop:disable Lint/UselessAssignment
-    def create_dockerfile(tmp_dir)
-      prebuilt_image = @image_name + '.tar.xz'
-
-      template = ERB.new(File.read(DOCKERFILE_TEMPLATE), nil, '<>')
-                 .result(binding)
-
-      File.open(File.join(tmp_dir, 'Dockerfile'), 'w') do |file|
-        file.write(template)
-      end
-    end
-    # rubocop:enable Lint/UselessAssignment
-
-    def copy_prebuilt_image(tmp_dir)
-      prebuilt_image = File.join(IMAGES_DIR, "#{@image_name}.tar.xz")
-      destination = File.join(tmp_dir, "#{@image_name}.tar.xz")
-      FileUtils.cp(prebuilt_image, destination)
-    end
-
-    def rpm_package_name
-      file = File.join(IMAGES_DIR, "#{@image_name}.tar.xz")
-      package_name = `rpm -qf #{file}`
-      if $CHILD_STATUS.exitstatus != 0
-        fail PrebuiltImageVerificationError,
-             "Cannot find rpm package providing #{file}: #{package_name}"
-      end
-      package_name
-    end
-
-    def verify_image
-      puts 'Verifying integrity of the pre-built image'
-      package_name = rpm_package_name
-      verification = `rpm --verify #{package_name}`
-      if $CHILD_STATUS.exitstatus != 0
-        fail PrebuiltImageVerificationError,
-             "Verification of #{package_name} failed: #{verification}"
-      end
-      true
-    end
-
-    private
-
-    def compute_repository_and_tag
-      # example of image name: sles12-docker.x86_64-1.0.0-Build7.2
-      regexp = /\A(?<name>.*)-docker\..*-(?<version>\d+\.\d+\.\d+)/
-      match = regexp.match(@image_name)
-      if match.nil?
-        fail DockerTagError,
-             "Cannot calculate the Docker tag for #{@image_name}"
-      end
-
-      @repository = "suse/#{match['name']}"
-      @tag        = match['version']
-      @image_id   = "#{@repository}:#{@tag}"
-    end
-
-  end
-end

data/test/prebuilt_image_test.rb

@@ -1,91 +0,0 @@
-require_relative 'test_helper'
-
-# rubocop:disable Metrics/ClassLength, Style/Documentation, Metrics/LineLength, Style/MethodCallParentheses:
-class PrebuiltImageTest < MiniTest::Test
-  describe 'PrebuiltImage' do
-    before do
-      @options = { password: '' }
-    end
-
-    after do
-      FakeFS::FileSystem.clear
-    end
-
-    describe 'listing' do
-      it 'works when no pre-built image is available' do
-        actual = Sle2Docker::PrebuiltImage.list
-        expected = []
-        assert_equal expected, actual
-      end
-
-      it 'lists the names of the available images' do
-        FakeFS do
-          expected = [
-            'sles11sp3-docker.x86_64-1.0.0-Build1.3',
-            'sles12-docker.x86_64-1.0.0-Build7.2'
-          ]
-
-          FileUtils.mkdir_p(Sle2Docker::PrebuiltImage::IMAGES_DIR)
-          expected.each do |image|
-            FileUtils.touch(
-              File.join(
-                Sle2Docker::PrebuiltImage::IMAGES_DIR,
-                "#{image}.tar.xz"
-              )
-            )
-          end
-
-          actual = Sle2Docker::PrebuiltImage.list
-          assert_equal expected, actual
-        end
-      end
-    end
-
-    describe 'activation' do
-      it 'creates a Dockerfile and builds the image' do
-        begin
-          image = 'sles12-docker.x86_64-1.0.0-Build7.2'
-          prebuilt_image = Sle2Docker::PrebuiltImage.new(image, @options)
-          expected = <<EOF
-FROM scratch
-MAINTAINER "Flavio Castelli <fcastelli@suse.com>"
-
-ADD sles12-docker.x86_64-1.0.0-Build7.2.tar.xz /
-EOF
-
-          tmp_dir = Dir.mktmpdir('sle2docker-test')
-          prebuilt_image.create_dockerfile(tmp_dir)
-          dockerfile = File.join(tmp_dir, 'Dockerfile')
-
-          assert File.exist?(dockerfile)
-          assert_equal(expected, File.read(dockerfile))
-        ensure
-          FileUtils.rm_rf(tmp_dir) if File.exist?(tmp_dir)
-        end
-      end
-
-      it 'triggers docker build' do
-        File.stubs(:exist?).returns(true)
-        tmp_dir = '/foo'
-        mocked_image = mock()
-        mocked_image.expects(:tag)
-          .with('repo' => 'suse/sles12', 'tag' => '1.0.0')
-          .once
-        mocked_image.expects(:tag)
-          .with('repo' => 'suse/sles12', 'tag' => 'latest')
-          .once
-
-        prebuilt_image = Sle2Docker::PrebuiltImage.new(
-          'sles12-docker.x86_64-1.0.0-Build7.2',
-          @options
-        )
-        prebuilt_image.expects(:prepare_docker_build_root).once.returns(tmp_dir)
-        prebuilt_image.expects(:verify_image).once
-        Docker::Image.expects(:build_from_dir).with(tmp_dir).once.returns(mocked_image)
-        FileUtils.expects(:rm_rf).with(tmp_dir).once
-
-        prebuilt_image.activate
-      end
-    end
-  end
-end