sle2docker 0.2.4 → 0.4.0

data/test/test_helper.rb

@@ -1,8 +1,14 @@
-require File.expand_path('../../lib/sle2docker',__FILE__)
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
+require File.expand_path('../../lib/sle2docker', __FILE__)
+
 require 'minitest/autorun'
 require 'stringio'
 require 'fakefs/safe'
 
+# rubocop:disable Style/Documentation, Lint/Eval
+
 class Object
   def capture(stream)
     begin
@@ -17,28 +23,27 @@ class Object
   end
 end
 
-class MiniTest::Test
-
-  def read_fixture(name)
-    File.read(File.expand_path("../fixtures/#{name}", __FILE__))
+module MiniTest
+  class Test
+    def read_fixture(name)
+      File.read(File.expand_path("../fixtures/#{name}", __FILE__))
+    end
   end
-
 end
 
 class FakeStdin
-
   # @param [Array[String]] fake_input
   def initialize(fake_input)
     @fake_input = fake_input.reverse
   end
 
-  def gets()
+  def gets
     @fake_input.pop
   end
 
-  def noecho()
+  def noecho
     yield(self)
   end
-
 end
 
+require 'mocha/mini_test'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sle2docker
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Flavio Castelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ronn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,11 +151,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  sle2docker is a convenience tool which creates SUSE Linux Enterprise images for Docker.
+  sle2docker is a convenience tool which creates SUSE Linux Enterprise images
+  for Docker.
 
   The tool relies on KIWI and Docker itself to build the images.
 
-  Packages can be fetched either from Novell Customer Center (NCC) or from a local Subscription Management Tool (SMT).
+  Packages can be fetched either from Novell Customer Center (NCC) or from a
+  local Subscription Management Tool (SMT).
 
   Using DVD sources is currently unsupported.
 email:
@@ -82,35 +168,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Changelog
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/sle2docker
+- coverage/.gitignore
 - lib/sle2docker.rb
-- lib/sle2docker/builder.rb
 - lib/sle2docker/cli.rb
 - lib/sle2docker/exceptions.rb
-- lib/sle2docker/template.rb
+- lib/sle2docker/prebuilt_image.rb
 - lib/sle2docker/version.rb
-- lib/templates/SLE11SP2/config.sh
-- lib/templates/SLE11SP2/config.xml.erb
-- lib/templates/SLE11SP2/root/etc/resolv.conf
-- lib/templates/SLE11SP3/config.sh
-- lib/templates/SLE11SP3/config.xml.erb
-- lib/templates/SLE11SP3/root/etc/resolv.conf
-- lib/templates/SLE12/config.sh
-- lib/templates/SLE12/config.xml.erb
-- lib/templates/SLE12/root/etc/resolv.conf
+- lib/templates/docker_build/dockerfile.erb
 - package/sle2docker.8.ronn
 - sle2docker.gemspec
-- test/builder_test.rb
-- test/fixtures/sle11sp3_config.xml
-- test/fixtures/sle11sp3_smt_auth_config.xml
-- test/fixtures/sle11sp3_smt_no_auth_https_config.xml
-- test/fixtures/sle11sp3_smt_no_auth_no_https_config.xml
-- test/template_test.rb
+- test/prebuilt_image_test.rb
 - test/test_helper.rb
 homepage: https://github.com/SUSE/sle2docker
 licenses:
@@ -132,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: sle2docker
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create SLE images for Docker

data/lib/sle2docker/builder.rb

@@ -1,118 +0,0 @@
-module Sle2Docker
-  class Builder
-
-    def initialize(options)
-      @options = options
-    end
-
-    # Creates the actual Docker image using kiwi
-    #
-    # @param [String] template_dir
-    # @return [String] path to the image created by kiwi
-    def create(template_dir)
-      tmp_dir          = Dir.mktmpdir("sle2docker")
-      tmp_template_dir = File.join(tmp_dir, "template")
-      result_dir       = File.join(tmp_dir, "result")
-
-      FileUtils.cp_r(File.join(template_dir, "."), tmp_template_dir)
-      FileUtils.mkdir_p(result_dir)
-
-      template_file = find_template_file(tmp_template_dir)
-      if template_file.end_with?('.erb')
-        template = render_template(template_file)
-        File.open(File.join(tmp_template_dir, "config.xml"), "w") do |file|
-          file.write(template)
-        end
-      end
-
-      docker_cmd = "docker run --rm "
-      # dns entries - otherwise docker uses Google's DNS
-      dns_entries.each do |entry|
-        docker_cmd += "--dns=#{entry} "
-      end
-      # the HTTP proxy specified by the user
-      if @options[:http_proxy]
-        docker_cmd += "-e http_proxy=#{@options[:http_proxy]} "
-      end
-      # ensure kiwi cache is persistent
-      docker_cmd += "-v /var/cache/kiwi:/var/cache/kiwi "
-      # share build dir
-      docker_cmd += "-v #{tmp_dir}:/#{tmp_dir} "
-      # required because kiwi needs to bind mount /proc while creating the image
-      docker_cmd += "--privileged "
-      # the image to use
-      docker_cmd += "opensuse/kiwi "
-      # kiwi directives
-      docker_cmd += "--build #{tmp_template_dir} --type docker -d #{result_dir}"
-      begin
-        puts "Starting build process inside of Docker container"
-        if !system(docker_cmd)
-          $stderr.printf("Something wrong happened during the build process\n")
-          exit(1)
-        end
-      end
-      Dir[File.join(result_dir, "*.tbz")].first
-    end
-
-    # Looks for either config.xml or config.xml.erb inside of the template
-    # directory.
-    #
-    # Exits with an error if no file is found.
-    #
-    # @param [String] template_dir
-    # @return [String] full path to the template file
-    def find_template_file(template_dir)
-      template_file = File.join(template_dir, 'config.xml.erb')
-
-      if !File.exist?(template_file)
-        raise ConfigNotFoundError.new("Cannot find config.xml.erb file inside of #{template_dir}")
-      end
-
-      template_file
-    end
-
-    # Performs the rendering of config.xml.erb
-    #
-    # @param [String] template_file
-    # @return [String] rendered template
-    def render_template(template_file)
-      host = if @options[:smt_host]
-        @options[:smt_host]
-      else
-        "nu.novell.com"
-      end
-
-      username = @options[:username]
-      if !username && (!@options[:password].empty? || !@options[:smt_host])
-        puts "Enter #{@options[:smt_host] ? '' : 'NCC '}username:"
-        username = $stdin.gets.chomp
-      end
-
-      password = @options[:password]
-      if (username || !@options[:smt_host]) && password.empty?
-        puts "Enter #{@options[:smt_host] ? '' : 'NCC '}password:"
-        password = $stdin.noecho(&:gets).chomp
-      end
-
-      credentials = ""
-      if username || !password.empty?
-        credentials = "username='#{username}' password='#{password}'"
-      end
-
-      use_ncc = !@options[:smt_host]
-
-      enable_https = !@options[:disable_https]
-
-      include_build_repos = @options[:include_build_repositories]
-
-      ERB.new(File.read(template_file)).result(binding)
-    end
-
-    def dns_entries
-      File.open('/etc/resolv.conf', 'r') do |file|
-        file.readlines("\n").grep(/\Anameserver\s+/).map{|l| l.split(" ", 2)[1].strip}
-      end
-    end
-  end
-
-end

data/lib/sle2docker/template.rb

@@ -1,21 +0,0 @@
-module Sle2Docker
-
-  class Template
-
-    def self.list
-      Dir[File.expand_path('../../templates/*', __FILE__)].map do |dir|
-        File.basename(dir)
-      end
-    end
-
-    def self.template_dir(template_name)
-      dir = File.expand_path("../../templates/#{template_name.upcase}", __FILE__)
-      if !File.exists?(dir)
-        raise TemplateNotFoundError.new("Cannot find template with name #{template_name}")
-      end
-      dir
-    end
-
-  end
-
-end

data/lib/templates/SLE11SP2/config.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-#================
-# FILE          : config.sh
-#----------------
-# PROJECT       : OpenSuSE KIWI Image System
-# COPYRIGHT     : (c) 2013 SUSE LLC
-#               :
-# AUTHOR        : Robert Schweikert <rjschwei@suse.com>
-#               :
-# BELONGS TO    : Operating System images
-#               :
-# DESCRIPTION   : configuration script for SUSE based
-#               : operating systems
-#               :
-#               :
-# STATUS        : BETA
-#----------------
-#======================================
-# Functions...
-#--------------------------------------
-test -f /.kconfig && . /.kconfig
-test -f /.profile && . /.profile
-
-#======================================
-# Greeting...
-#--------------------------------------
-echo "Configure image: [$kiwi_iname]..."
-
-#======================================
-# Setup baseproduct link
-#--------------------------------------
-suseSetupProduct
-
-#======================================
-# SuSEconfig
-#--------------------------------------
-suseConfig
-
-#======================================
-# Activate services
-#--------------------------------------
-suseActivateDefaultServices
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0

data/lib/templates/SLE11SP2/config.xml.erb

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<image schemaversion="6.1" name="sles-11-SP2-docker-guest">
-  <description type="system">
-    <author>Flavio Castelli</author>
-    <contact>fcastelli@suse.com</contact>
-    <specification>SLE 11 SP2 Docker image</specification>
-  </description>
-  <preferences>
-    <type image="docker" container="sles11sp2">
-      <machine>
-        <vmdisk/>
-        <vmnic interface="eth0" mode="veth"/>
-      </machine>
-    </type>
-    <version>1.0.0</version>
-    <packagemanager>zypper</packagemanager>
-    <rpm-check-signatures>false</rpm-check-signatures>
-    <rpm-force>true</rpm-force>
-    <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
-    <hwclock>utc</hwclock>
-    <timezone>US/Eastern</timezone>
-  </preferences>
-  <users group="root">
-    <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
-  </users>
-  <repository type="rpm-md" alias="SLES11:SP2:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
-    <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP2-Updates/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
-  </repository>
-  <repository type="rpm-md" alias="SLES11:SP2:Core" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
-    <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP2-Core/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
-  </repository>
-  <repository type="rpm-md" alias="SLES11:SP1:Updates" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
-    <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP1-Updates/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
-  </repository>
-  <repository type="rpm-md" alias="SLES11:SP1:Pool" <%= 'imageinclude="true"' if include_build_repos %> <%= credentials %>>
-    <source path="http<%= "s" if enable_https %>://<%= host %>/repo/$RCE/SLES11-SP1-Pool/sle-11-x86_64<%= "?credentials=NCCcredentials" if use_ncc %>"/>
-  </repository>
-  <packages type="image">
-    <package name="coreutils"/>
-    <package name="iputils"/>
-  </packages>
-  <packages type="bootstrap">
-    <package name="filesystem"/>
-    <package name="glibc-locale"/>
-    <package name="libstdc++46"/>
-    <package name="libgcc46"/>
-    <package name="openssl-certs"/>
-  </packages>
-</image>