sle2docker 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb74b020e570764a417ceb7dcfb6044f6da1c02
-  data.tar.gz: 7f8f3fd365400356f62bb3f4aa61287122edc16b
+  metadata.gz: ba695a590e56095cca42897195533744bdc29bf3
+  data.tar.gz: 0a00b46f07ffc4dcdf85dd4c2dbed07ed8e9f1f2
 SHA512:
-  metadata.gz: 4296f310866f871a4f67a21aa411da9beecb95e6d4cc9d1a4dfa7a056e7ac96c92387106023dc041373e3bb96eed8290dd692c9c31c0a09ddd8dcf70aade4d0e
-  data.tar.gz: 819642dbbc8df8de035a073f7e39ecebca06f6f42e7da56a40f0aac727a1192b5c19d27a1d4fd5569ab5118c8f44c6c852d08d5eb54f645692e237db453c055e
+  metadata.gz: 731ddcbf5d026a5e1b0c6a79147efcb6dd1004162806e334961304b75ae32bdc0b04ce81d8af8d04d6dd946ad17db5018ec73dcce7cca522f910d6aff8ef5d10
+  data.tar.gz: 4a3f8c444c6410c00f93ab89a4ba3cf5e47b678e8f2d6850d9914bc3df674e3cde3947f68ab11b166cca45354c4fc22e8e407cdadd47707f968541c949da5871

data/Changelog

@@ -1,3 +1,8 @@
+Wed Nov 12 15:46:38 CET 2014  Flavio Castelli <flavio@castelli.name>
+
+	* Version 0.2.3:
+		- Handle http proxy
+
 Thu Oct 30 13:48:45 CET 2014  Flavio Castelli <fcastelli@suse.com>
 
 	* Version 0.2.2:

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 
-# Specify your gem's dependencies in dister.gemspec
+# Specify your gem's dependencies in sle2docker.gemspec
 gemspec

data/lib/sle2docker/builder.rb

@@ -25,7 +25,15 @@ module Sle2Docker
         end
       end
 
-      docker_cmd = "docker run "
+      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
@@ -97,6 +105,12 @@ module Sle2Docker
 
       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/cli.rb

@@ -73,6 +73,9 @@ module Sle2Docker
                   :type => :boolean,
                   :default => false,
                   :desc => "Do not use HTTPS when accessing repositories"
+    method_option :http_proxy, :aliases => ["--http-proxy"],
+                  :default => ENV['http_proxy'],
+                  :desc => "HTTP proxy to use (eg: http://squid.local:3128)"
     def build(template_name)
       template_dir = Template.template_dir(template_name)
       builder = Builder.new(options)

data/lib/sle2docker/version.rb

@@ -1,5 +1,5 @@
 module Sle2Docker
 
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 
 end

data/sle2docker.gemspec

@@ -28,6 +28,7 @@ EOD
   s.add_runtime_dependency "thor"
   s.add_development_dependency "bundler"
   s.add_development_dependency "yard"
+  s.add_development_dependency "fakefs"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/test/builder_test.rb

@@ -166,5 +166,25 @@ class BuilderTest < MiniTest::Test
     end
   end
 
+  # Testing parsing of resolv.conf
+
+  def test_parse_resolv_conf
+    actual = []
+    expected = %w(1 2 3)
+
+    FakeFS do
+      FileUtils.mkdir("/etc")
+      File.open("/etc/resolv.conf", 'w') do |file|
+        file.write("nameserver 1\n")
+        file.write("nameserver  2\n")
+        file.write("nameserver\t\t3\n")
+        file.write("# nameserver ignored")
+      end
+      builder = Sle2Docker::Builder.new(@options)
+      actual = builder.dns_entries()
+    end
+
+    assert_equal(expected, actual)
+  end
 end
 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../lib/sle2docker',__FILE__)
-require 'bundler/setup' # Use bundled environment for testing
 require 'minitest/autorun'
 require 'stringio'
+require 'fakefs/safe'
 
 class Object
   def capture(stream)

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: sle2docker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Flavio Castelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   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
     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:
-    - - '>='
+    - - ">="
       - !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: fakefs
+  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'
 description: |
@@ -67,7 +81,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Changelog
 - Gemfile
 - LICENSE
@@ -108,18 +122,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: sle2docker
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create SLE images for Docker
 test_files: []
+has_rdoc: