minke 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a968e0c1571582674fa98f092560407ae4ca50
-  data.tar.gz: 0f81d735278d8c5580b475a916572354504dbf9d
+  metadata.gz: 1269e53e6dd27dd353fea28c6685abfdc5c587ef
+  data.tar.gz: 4712f2d2267f4304948ae9c9df9c414a27cc41df
 SHA512:
-  metadata.gz: 1262da8729c6d2fe0060ebe3f24f737c1d2822fedf4435b1ce5a274b7aeff1627e8a36183ec52abbaecebdff07f1b31733a1614d4552d2c9dafd13655e5fd456
-  data.tar.gz: 2b8d1055d0554c843b015aae2d80209019a388bc17f12cf81c89866cd4dd21580b303c17a4cc274fea2b1f8b208e3bdeafa1ad7e2bb3e3dbaa012556812204af
+  metadata.gz: 947f7c63f787d7ecf89ae5fbb3d7f8caee3c0a50879dee58654257824d2ce14e70bca21b5c209f79e67ac248b2cfe50bd8f898c04aae1b6c046ba27d10c938e9
+  data.tar.gz: a0747a16ad9a200a9ec9888371cc5ed684199b7fa715a0a2430dd7997f51b72523ef76d26f49c06f200cabdaa99665d2ea38260a719e8e1a2d48176ae4a52049

data/.travis.yml

@@ -30,7 +30,7 @@ after_deploy:
     docker build -t nicholasjackson/minke --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` .;
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     docker push nicholasjackson/minke:latest;
-    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.0;
-    docker push nicholasjackson/minke:1.13.0;
+    docker tag nicholasjackson/minke nicholasjackson/minke:1.13.1;
+    docker push nicholasjackson/minke:1.13.1;
     curl https://hooks.microbadger.com/images/nicholasjackson/minke/tkpohfdrYPE0B0TL5NzLcOap4k0=;
     fi

data/bin/minke

@@ -38,6 +38,7 @@ Commonly used command are:
    run         :     start the application
    build_image :     build a docker image
    push        :     push built image to the registry
+   encrypt     :     encrypt secrets with a private key
 See 'minke COMMAND --help' for more information on a specific command.
 HELP
 
@@ -50,7 +51,12 @@ end
 
 subcommands = { 
   'generate' => OptionParser.new do |opts|
-     # ...
+    opts.banner = "Usage: minke [options] generate [options]"
+
+    opts.on('-g', '--generator GENERATOR', 'Generator plugin to use') { |v| options[:generator] = v }
+    opts.on('-o', '--output OUTPUT', 'Output folder') { |v| options[:output] = v }
+    opts.on('-a', '--application_name NAME', 'Application name') { |v| options[:name] = v }
+    opts.on('-n', '--namespace NAMESPACE', 'Application namespace') { |v| options[:namespace] = v }
    end,
 
    'build' => OptionParser.new do |opts|
@@ -58,100 +64,70 @@ subcommands = {
    end,
 
    'test' => OptionParser.new do |opts|
-     opts.banner = "Usage: minke test [options]"
+     opts.banner = "Usage: minke [options] test [options]"
 
      opts.on("-c", "--config", "Load config file at given path") { |c| options[:config] = c }
-   end
+   end,
+
+   'encrypt' => OptionParser.new do |opts|
+      opts.banner = "Usage: minke [options] encrypt [options]"
+
+      opts.on('-e', '--encrypt STRING', 'Encrypt a string') { |v| options[:encrypt] = v }
+      opts.on('-k', '--key STRING', 'Private key to use for encryption') { |v| options[:key] = v }
+    end
  }
 
 global.order!
 command = ARGV.shift
-subcommands[command].order!
+subcommands[command].order! unless command == ''
 
-def load_config options
-  reader = Minke::Config::Reader.new Minke::Logging.create_logger(options[:verbose])
-  config = reader.read options[:config]
+def load_config config_file, verbose
+  reader = Minke::Config::Reader.new Minke::Logging.create_logger(verbose)
+  config = reader.read config_file
   variables = Minke::Generators::ConfigVariables.new.tap do |v|
       v.application_name = config.application_name
       v.namespace = config.namespace
       v.src_root = File.expand_path('../')
   end
-  processor = Minke::Generators::Processor.new variables, nil, Minke::Logging.create_logger(options[:verbose])
+  processor = Minke::Generators::Processor.new variables, nil, Minke::Logging.create_logger(verbose)
   generator_config = processor.get_generator config.generator_name
   return config, generator_config
 end
 
-config, generator_config = load_config options
-
-case command
-when "test"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).test
-when "build"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).build
-when "fetch"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).fetch
-when "cucumber"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).cucumber
-when "build_image"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).build_image
-when "run"
-  Minke::Command.new(
-    config, 
-    generator_config, 
-    options[:verbose]
-  ).run
-when "push"
-  Minke::Command.new(
+def doCommand(command, verbose, config_file = nil)
+  config, generator_config = load_config(config_file, verbose) unless config_file == nil
+  c = Minke::Command.new(
     config, 
-    generator_config, 
-    options[:verbose]
-  ).run
-end
-
-exit 0
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: minke [options]"
+    generator_config,
+    verbose
+  )
 
-  opts.on('-e', '--encrypt STRING', 'Encrypt a string') { |v| options[:encrypt] = v }
-  opts.on('-k', '--key STRING', 'Private key to use for encryption') { |v| options[:key] = v }
-  opts.on('-g', '--generator GENERATOR', 'Generator plugin to use') { |v| options[:generator] = v }
-  opts.on('-o', '--output OUTPUT', 'Output folder') { |v| options[:output] = v }
-  opts.on('-a', '--application_name NAME', 'Application name') { |v| options[:name] = v }
-  opts.on('-n', '--namespace NAMESPACE', 'Application namespace') { |v| options[:namespace] = v }
-
-end.parse!
+  puts c
+  c.public_send(command)
+end
 
-# load the installed generators
-variables = Minke::Generators::ConfigVariables.new.tap do |v|
-  v.application_name = options[:name]
-  v.namespace = options[:namespace]
-  v.src_root = File.expand_path(options[:output]) unless options[:output] == nil
+def doGenerate(options)
+  # load the installed generators
+  variables = Minke::Generators::ConfigVariables.new.tap do |v|
+    v.application_name = options[:name]
+    v.namespace = options[:namespace]
+    v.src_root = File.expand_path(options[:output]) unless options[:output] == nil
+  end
+  logger = Minke::Logging.create_logger(options[:verbose])
+  processor = Minke::Generators::Processor.new(
+    variables, 
+    Minke::Docker::DockerRunner.new(logger),
+    logger
+    )
+
+  processor.process options[:generator], options[:output]
 end
-processor = Minke::Generators::Processor.new variables, Minke::Docker::DockerRunner.new
 
-if options[:encrypt] != nil
-  puts "Please specify a key to use for encryption using -k [path to file]" if options[:key] == nil
+def doEncrypt(options)
+  if options[:key] == nil
+    puts "Please specify a key to use for encryption using -k [path to file]"
+    exit 1 
+  end
 
   encrypt = Minke::Encryption::Encryption.new options[:key]
 
@@ -161,13 +137,30 @@ if options[:encrypt] != nil
   puts "  fingerprint: #{encrypt.fingerprint}"
   puts '  value: >'
   encrypt.encrypt_string(options[:encrypt]).split("\n").each { |l| puts "    #{l}"}
-
-  exit 0
 end
 
-if options[:generator] == nil || options[:output] == nil || options[:name] == nil || options[:namespace] == nil
-  puts "Please specify options use: minke --help for help on command line options"
-  exit 0
-end
+case command
+when "test"
+  doCommand(:test, options[:verbose], options[:config])
+when "build"
+  doCommand(:build, options[:verbose], options[:config])
+when "fetch"
+  doCommand(:fetch, options[:verbose], options[:config])
+when "cucumber"
+  doCommand(:cucumber, options[:verbose], options[:config])
+when "build_image"
+  doCommand(:build_image, options[:verbose], options[:config])
+when "run"
+  doCommand(:run, options[:verbose], options[:config])
+when "push"
+  doCommand(:push, options[:verbose], options[:config])
+when "generate"
+  if options[:generator] == nil || options[:output] == nil || options[:name] == nil || options[:namespace] == nil
+    puts "Please specify options use: minke generate --help for help on command line options"
+    exit 0
+  end
 
-processor.process options[:generator], options[:output]
+  doGenerate(options)
+when "encrypt"
+  doEncrypt(options)
+end

data/docker/Gemfile

@@ -8,7 +8,7 @@ gem "cucumber"
 gem "cucumber-rest-api", "= 0.3"
 gem 'cucumber-api', '~> 0.3'
 
-gem 'minke', "= 1.12.8"
+gem 'minke', "= 1.13.1"
 gem 'minke-generator-swift', "= 0.2.2"
 gem 'minke-generator-netmvc'
 gem 'minke-generator-go', "= 0.8.2"

data/lib/minke/scripts/minke

@@ -1,5 +1,5 @@
 #!/bin/bash
-MINKE_VERSION="1.13.0"
+MINKE_VERSION="1.13.1"
 ERROR="Please specify a command e.g. ./minke test"
 
 DOCKER_SOCK="/var/run/docker.sock:/var/run/docker.sock"

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler