cog-rb 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4dde16790533cfc4b0c7eb7c3bf5f05b86adcac
-  data.tar.gz: 0eb085453afbd3e1461f66e416d4eea1c3eaf2fb
+  metadata.gz: 4c809f7a4ef732bb4a4d9d04801385f1e5603bfa
+  data.tar.gz: cb5202722011ce28c55b76f86ee86d12858b3047
 SHA512:
-  metadata.gz: 9558baf799866d0ea896c6dede845ab2f85401858ce7b953471cf00d64a4b3fb5afe86729567333b115d02430f717450b9aa1d05870a93297b062a3794ac4380
-  data.tar.gz: fd872243d8402203218b36074bffa2c8a48e50984707fcfcb170b46aae04eee16a95a568d29c953a70954ac5b12fe9ec66704172166ec4900b8182434727878d
+  metadata.gz: 6ebe57eeba800dc524e7126a7efd3d06d89d21a3de4e7cd06ba3275798f88833e5f0185ef9f56b454708dcdeebff4706a1746e7232f83f3c941bc03b151ea449
+  data.tar.gz: 5c8a2c5cb215b4afadb5bf5bb85366c089c363f599314c8fa8eca8716b7ac192dea219113148b86a4be0f880900cbbf88c82c3c9f1efb2d466d498841cf61139

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.1
+
+* Adds `cogrb docker:release` task to build and push an updated Docker image in one step.
+
+## 0.3.0 - Unreleased development version
+
+**Note:** This version of `cog-rb` is not compatible with Cog versions lower than 0.14.
+
+* Updates `cogrb templates:update` task to use bundle configuration version 4.
+* Removes the subcommand support added in 0.2.0. We will revisit this in the future when subcommands are a first class feature in Cog. Attempting to support it at the command implementation level turned out to be unworkable.
+
 ## 0.2.0
 
 * Adds support for subcommands

data/lib/cog/bundle.rb

@@ -1,51 +1,49 @@
 class Cog
   class Bundle
-    attr_reader :name, :config
+    attr_reader :name
 
-    def initialize(name, base_dir: nil, config_file: nil)
+    def initialize(name, base_dir: nil)
       @name = name
       @base_dir = base_dir || File.dirname($0)
-      @config = load_config(config_file || File.join(@base_dir, 'config.yaml'))
       @module = create_bundle_module
-
-      load_commands
     end
 
     def create_bundle_module
       return if Object.const_defined?('CogCmd')
-
       Object.const_set('CogCmd', Module.new)
       CogCmd.const_set(@name.capitalize, Module.new)
     end
 
-    def load_config(path=nil)
-      path ||= File.join(@base_dir, 'config.yaml')
-      Cog::Config.new(path)
-    end
+    def command_instance(command_name)
+      command_path = command_name.split('-')
+      require File.join(@base_dir, 'lib', 'cog_cmd', @name, *command_path)
+
+      # translate snake-case command names to camel case
+      command_class = command_name.gsub(/(\A|_)([a-z])/) { $2.upcase }
 
-    def load_commands
-      @config[:commands].each do |command, config|
-        require File.join(@base_dir, 'lib', 'cog_cmd', @name, command)
-      end
+      # convert hyphenated command names into class hierarchies,
+      # e.g. template-list becomes Template::List.
+      command_class = command_class.split('-').map{ |seg| seg.capitalize }.join('::')
+
+      @module.const_get(command_class).new
     end
 
     def run_command
       command = ENV['COG_COMMAND']
-      command_class = command.gsub(/(\A|_)([a-z])/) { $2.upcase }
-
-      target = @module.const_get(command_class).new
+      target = command_instance(command)
       target.execute
-    # Abort will end command execution and abort the pipeline
     rescue Cog::Abort => msg
+      # Abort will end command execution and abort the pipeline
       response = Cog::Response.new
       response['body'] = msg
       response.abort
       response.send
-    # Stop will end command execution but the pipeline will continue
     rescue Cog::Stop => msg
+      # Stop will end command execution but the pipeline will continue
       response = Cog::Response.new
       response['body'] = msg
       response.send
     end
+
   end
 end

data/lib/cog/request.rb

@@ -1,4 +1,3 @@
-
 require 'json'
 
 class Cog
@@ -8,7 +7,7 @@ class Cog
     def initialize
       @args = populate_args
       @options = populate_options
-      @input = JSON.parse(STDIN.read)
+      @input = (STDIN.tty?) ? {} : JSON.parse(STDIN.read)
     end
 
     private

data/lib/cog/version.rb

@@ -1,3 +1,3 @@
 class Cog
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/cog.rb

@@ -2,8 +2,6 @@
 require_relative 'cog/bundle'
 require_relative 'cog/config'
 require_relative 'cog/command'
-require_relative 'cog/subcommand'
-require_relative 'cog/aggregate_command'
 require_relative 'cog/request'
 require_relative 'cog/response'
 require_relative 'cog/version'

data/lib/rspec/cog/setup.rb

@@ -39,7 +39,14 @@ module Cog::RSpec::Setup
   let(:command_name){ raise "Must supply a :command_name!" }
 
   let(:command) do
-    Object.const_get("CogCmd::#{bundle_name.capitalize}::#{command_name.capitalize}").new
+    # translate snake-case command names to camel case
+    command_class = command_name.gsub(/(\A|_)([a-z])/) { $2.upcase }
+
+    # convert hyphenated command names into class hierarchies,
+    # e.g. template-list becomes Template::List.
+    command_class = command_class.split('-').map{ |seg| seg.capitalize }.join('::')
+
+    Object.const_get("CogCmd::#{bundle_name.capitalize}::#{command_class}").new
   end
 
   let(:invocation_id) { SecureRandom.uuid }
@@ -66,7 +73,8 @@ module Cog::RSpec::Setup
     # TODO: receive a single input on STDIN, multiple for :fetch_input
 
     # Expose previous inputs on STDIN
-    expect(STDIN).to receive(:read).and_return(cog_env.to_json)
+    # We use allow because not all commands receive input
+    allow(STDIN).to receive(:read).and_return(cog_env.to_json)
 
     # Use allow because not all commands will need to do this
     allow(command).to receive(:fetch_input).and_return(cog_env)

data/lib/tasks/cog.rake

@@ -7,21 +7,21 @@ namespace :template do
   task :update do
     puts "Current bundle configuration version is #{config['version']}."
 
-    templates = FileList.new('templates/*/*.mustache')
+    templates = FileList.new('templates/*')
     return if templates.nil? || templates.size == 0
 
     config['templates'] ||= {}
     templates.each do |file|
       (provider, template) = file.split('/')[-2..-1]
-      template.gsub!(/\.mustache\z/, '')
+      template.gsub!(/\..*\z/, '')
       template_content = File.read(file)
 
       config['templates'][template] ||= {}
-      prev_content = config['templates'][template][provider]
+      prev_content = config['templates'][template]['body']
 
       if template_content != prev_content
         puts "Updating bundle configuration for template #{provider}/#{template}."
-        config['templates'][template][provider] = template_content
+        config['templates'][template]['body'] = template_content
       end
     end
 
@@ -50,6 +50,6 @@ namespace :docker do
 
   desc "Push updated Docker image"
   task :push => [ :build ] do
-    puts("docker", "push", docker_image)
+    system("docker", "push", docker_image)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cog-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mark Imbriaco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,6 @@ files:
 - bin/setup
 - cog-rb.gemspec
 - lib/cog.rb
-- lib/cog/aggregate_command.rb
 - lib/cog/bundle.rb
 - lib/cog/command.rb
 - lib/cog/config.rb
@@ -69,7 +68,6 @@ files:
 - lib/cog/service.rb
 - lib/cog/services/memory.rb
 - lib/cog/services/metadata.rb
-- lib/cog/subcommand.rb
 - lib/cog/version.rb
 - lib/rspec/cog.rb
 - lib/rspec/cog/matchers.rb

data/lib/cog/aggregate_command.rb

@@ -1,57 +0,0 @@
-require 'cog/exceptions'
-
-class Cog
-  class AggregateCommand < Cog::Command
-
-    def initialize
-      subcommands = self.class.const_get("SUBCOMMANDS")
-      subcommand = request.args.shift
-
-      require_subcommand!(subcommand, subcommands)
-
-      load_subcommands(subcommands)
-
-      @subcommand_class = create_subcommand_class(subcommand)
-    end
-
-    def run_command
-      response.content = subcommand().run_command
-    end
-
-    private
-
-    def subcommand
-      @subcommand_inst ||= @subcommand_class.new(request)
-    end
-
-    def load_subcommands(subcommands)
-      subcommands.each do |sc|
-        require File.join(File.dirname($0), 'lib', 'cog_cmd', ENV['COG_BUNDLE'], ENV['COG_COMMAND'], sc)
-      end
-    end
-
-    def create_subcommand_class(subcommand)
-      subcommand_class = subcommand.gsub(/(\A|_)([a-z])/) { $2.upcase }
-      self.class.const_get(subcommand_class)
-    end
-
-    def require_subcommand!(subcommand, subcommands, exception = Cog::Abort)
-      unless subcommand
-        raise exception, missing_subcommand_msg(subcommands)
-      end
-
-      unless subcommands.include?(subcommand)
-        raise exception, unknown_subcommand_msg(subcommand, subcommands)
-      end
-    end
-
-    def missing_subcommand_msg(subcommands)
-      "Missing subcommand. Please specify one of '#{subcommands.join(', ')}'"
-    end
-
-    def unknown_subcommand_msg(subcommand, subcommands)
-      "Unknown subcommand '#{subcommand}'. Please specify one of '#{subcommands.join(', ')}'"
-    end
-  end
-end
-

data/lib/cog/subcommand.rb

@@ -1,16 +0,0 @@
-class Cog
-  class SubCommand
-
-    def initialize(request = nil)
-      @request = request
-    end
-
-    private
-
-    def request
-      @request
-    end
-
-  end
-end
-