sle2docker 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e55c98b03880649eebf4e52e7c6d42ef78f021f5
-  data.tar.gz: 8b6e1ff04152fa335cec4630fc968e2e3cfcb762
+  metadata.gz: 3ba4bc4ef832b69bf18ec9d3ba0fd0b5518ae3d6
+  data.tar.gz: 712d2fb95e42161a359a2eb0286f2922f22ae054
 SHA512:
-  metadata.gz: bc35d46a8497871fee7aaef46b06a06a748cc39dd027065b74b8721d47e39685f1e48d5f3f993220d124da89bd24399778c8a494e15e8d18160cfa50384b7427
-  data.tar.gz: 8e77d6ab0d8ca19f5893bbbdd190091a2f5c9cf8b5974ec4002fa0623f2ee7213ea8f104f95d08e76ac0fb2b09a53b4aebbcd429b249e5af9882b829fc42c352
+  metadata.gz: adf5fa4931a457bcfd3e2d284ed61632f5289fd7a97940b1e9bf68bf21a31773e5b903727ad242374777ffd4053cd221117284d5fdf189647e0de2919cd8d10a
+  data.tar.gz: e4ccfa007af3e0c836261cd659a7f1a92c1a32de21b792990978d06c539ec0c89c183f870927e320722b1f84f5009f1bcc0559d11c05b7f82996d7edb457fd4a

data/Changelog

@@ -1,3 +1,9 @@
+Wed Sep 10 22:04:10 CEST 2014  Flavio Castelli <flavio@castelli.name>
+
+	* Version 0.2.0:
+		- Handle cli switches using the Thor
+		- Syntax changed
+
 Tue Sep 09 15:42:26 CEST 2014  Flavio Castelli <fcastelli@suse.com>
 
 	* Version 0.1.4: minor fixes to gemspec

data/Gemfile

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

data/README.md

@@ -62,13 +62,20 @@ system.
 To build a template just use the following command:
 
 ```
-sle2docker <template name>
+sle2docker build TEMPLATE
 ```
 
 A list of the available templates can be obtained by running:
 
 ```
-sle2docker -l
+sle2docker list
+```
+
+A templated rendered with user provided data can be printed by using the
+following command:
+
+```
+sle2docker show TEMPLATE
 ```
 
 ## SUSE Customer Center integration
@@ -79,7 +86,7 @@ his credentials. It is possible to start a build in a non interactive way by
 using the following command:
 
 ```
-sle2docker -u USERNAME -p PASSWORD TEMPLATE_NAME
+sle2docker build -u USERNAME -p PASSWORD TEMPLATE_NAME
 ```
 
 
@@ -89,7 +96,7 @@ It is possible to download all the reuiqred packages from a local
 Subscription Management Tool (SMT) instance:
 
 ```
-sle2docker -s SMT_SERVER_HOSTNAME TEMPLATE_NAME
+sle2docker build -s SMT_SERVER_HOSTNAME TEMPLATE
 ```
 
 By default sle2docker assumes the contents of the SMT server are served over
@@ -97,7 +104,7 @@ HTTPS. To force the retrieval of the package over plain HTTP use the
 following command:
 
 ```
-sle2docker -s SMT_SERVER_HOSTNAME --disable-https TEMPLATE_NAME
+sle2docker build -s SMT_SERVER_HOSTNAME --disable-https TEMPLATE
 ```
 
 By default sle2docker expects the SMT instance to not require any form of
@@ -105,7 +112,7 @@ authentication. However it is possible to specify the access credentials by
 using the following command:
 
 ```
-sle2docker -s SMT_SERVER_HOSTNAME -u USERNAME -p PASSWORD TEMPLATE_NAME
+sle2docker build -s SMT_SERVER_HOSTNAME -u USERNAME -p PASSWORD TEMPLATE
 ```
 
 

data/bin/sle2docker

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
 require_relative '../lib/sle2docker'
 
-container = Sle2Docker::Cli.new.start()
-puts "Container created, it can be imported by running the following command:"
-puts "  docker import - <desired image name> < #{container}"
-puts "\nThen the '#{File.expand_path(File.join(File.dirname(container), '..'))}' directory and all its contents can be removed."
-puts "Note well: KIWI created some of these files while running as root user, " +
-     "hence root privileges are required to remove them."
+Sle2Docker::Cli.start(ARGV)
+

data/lib/sle2docker.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'fileutils'
 require 'io/console'
 require 'optparse'
+require 'thor'
 require 'tmpdir'
 
 require_relative 'sle2docker/cli'

data/lib/sle2docker/cli.rb

@@ -1,83 +1,96 @@
 module Sle2Docker
 
-  class Cli
+  class Cli < Thor
+
+    #def initialize
+    #  @options, @template_dir = parse_options()
+    #end
+
+    #def start
+    #  builder = Builder.new(@options)
+    #  builder.create(@template_dir)
+    #rescue ConfigNotFoundError => e
+    #  $stderr.printf(e.message + "\n")
+    #  exit(1)
+    #end
+
+    desc "list", "List the available templates"
+    def list
+      puts "Available templates:"
+      Template.list.each {|template| puts "  - #{template}"}
+    end
 
-    def initialize
-      @options, @template_dir = parse_options()
+    map "-v" => :version
+    desc "version", "Display version"
+    def version
+      puts Sle2Docker::VERSION
     end
 
-    def start
-      builder = Builder.new(@options)
-      builder.create(@template_dir)
+    desc "show TEMPLATE", "Print the rendered TEMPLATE"
+    method_option :username, :aliases => "-u", :type => :string,
+                  :default => nil,
+                  :desc => "Username required to access repositories"
+    method_option :password, :aliases => "-p", :type => :string,
+                  :default => "",
+                  :desc => "Password required to access repositories"
+    method_option :smt_host, :aliases => ["-s", "--smt-host"], :type => :string,
+                  :default => nil,
+                  :desc => "SMT machine hosting the repositories"
+    method_option :disable_https, :aliases => ["--disable-https"],
+                  :type => :boolean,
+                  :default => false,
+                  :desc => "Do not use HTTPS when accessing repositories"
+    def show(template_name)
+      template_dir = Template.template_dir(template_name)
+      builder = Builder.new(options)
+      template_file = builder.find_template_file(template_dir)
+      if template_file.end_with?('.erb')
+        template = builder.render_template(template_file)
+        puts "\n\n"
+        puts template
+      end
     rescue ConfigNotFoundError => e
       $stderr.printf(e.message + "\n")
       exit(1)
+    rescue TemplateNotFoundError => ex
+      $stderr.printf(ex.message + "\n")
+      $stderr.printf("To list the available templates use:\n")
+      $stderr.printf("  sle2docker list\n")
+      exit(1)
     end
 
-    private
-
-    def parse_options()
-      options = {}
-
-      optparse = OptionParser.new do|opts|
-        opts.banner = "Usage: sle2docker [options] TEMPLATE"
-
-        options[:username] = nil
-        opts.on('-u', '--username USERNAME',
-                'Username required to access repositories' ) do |u|
-          options[:username] = u
-        end
-
-        options[:password] = ""
-        opts.on('-p', '--password PASSWORD',
-                'Password required to access repositories' ) do |p|
-          options[:password] = p
-        end
-
-        options[:smt_host] = nil
-        opts.on('-s', '--smt-host SMT_HOST',
-                'SMT machine hosting the repositories' ) do |smt_host|
-          options[:smt_host] = smt_host
-        end
-
-        options[:disable_https] = false
-        opts.on('--disable-https',
-                'Do not use HTTPS when accessing repositories' ) do
-          options[:disable_https] = true
-        end
-
-        opts.on('-l', '--list-templates', 'List the available templates' ) do
-          puts "Available templates:"
-          Template.list.each {|template| puts "  - #{template}"}
-          exit
-        end
-
-
-        opts.on('-h', '--help', 'Display this screen' ) do
-          puts opts
-          exit
-        end
-
-        opts.on('-v', '--version', 'Display version' ) do
-          puts Sle2Docker::VERSION
-          exit
-        end
-
-      end
-
-      optparse.parse!
-
-      if ARGV.count != 1
-        $stderr.printf("Template not provided\n")
-        exit(1)
-      end
-
-      [options, Template.template_dir(ARGV[0])]
+    desc "build TEMPLATE", "Use TEMPLATE to build a SLE Docker image"
+    method_option :username, :aliases => "-u", :type => :string,
+                  :default => nil,
+                  :desc => "Username required to access repositories"
+    method_option :password, :aliases => "-p", :type => :string,
+                  :default => "",
+                  :desc => "Password required to access repositories"
+    method_option :smt_host, :aliases => ["-s", "--smt-host"], :type => :string,
+                  :default => nil,
+                  :desc => "SMT machine hosting the repositories"
+    method_option :disable_https, :aliases => ["--disable-https"],
+                  :type => :boolean,
+                  :default => false,
+                  :desc => "Do not use HTTPS when accessing repositories"
+    def build(template_name)
+      template_dir = Template.template_dir(template_name)
+      builder = Builder.new(options)
+      container = builder.create(template_dir)
+      puts "Container created, it can be imported by running the following command:"
+      puts "  docker import - <desired image name> < #{container}"
+      puts "\nThen the '#{File.expand_path(File.join(File.dirname(container), '..'))}' directory and all its contents can be removed."
+      puts "Note well: KIWI created some of these files while running as root user, " +
+           "hence root privileges are required to remove them."
+    rescue ConfigNotFoundError => e
+      $stderr.printf(e.message + "\n")
+      exit(1)
     rescue TemplateNotFoundError => ex
       $stderr.printf(ex.message + "\n")
       $stderr.printf("To list the available templates use:\n")
-      $stderr.printf("  sle2docker -l\n")
+      $stderr.printf("  sle2docker list\n")
       exit(1)
     end
+
   end
 end

data/lib/sle2docker/version.rb

@@ -1,5 +1,5 @@
 module Sle2Docker
 
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 
 end

data/sle2docker.gemspec

@@ -25,6 +25,7 @@ EOD
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "sle2docker"
 
+  s.add_runtime_dependency "thor"
   s.add_development_dependency "bundler"
   s.add_development_dependency "yard"
   s.files        = `git ls-files`.split("\n")

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sle2docker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Flavio Castelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-10 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
@@ -55,6 +69,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Changelog
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile