cog-rb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 861e88d4018ad9f506ed5ef6269fc35f2faaa5f7
-  data.tar.gz: ebf126f7e79f2ffa305b90d0c6effc3ad62e778b
+  metadata.gz: 085d788c6aa8b12e85f39eef44318fe46eb3a6b6
+  data.tar.gz: 56d0d6d2e2137f05461a245747a8d01a942fc1c6
 SHA512:
-  metadata.gz: c69220a7ecb2c88b1e9a7fe6f9ae7d8aea56ba0d60f46e76a0717d673703c3df7c99761cbc57a06a86f96bd413779d04c25f41498586e983255732219d6904b6
-  data.tar.gz: 5b844d99006f5f3d9d8d679090fb9471012904966b9e201c3b4fc94b33d8d364d5527b73aa82b2fceab255f0653cb7b5f67961a538d16dc4af501fd142ae7cb4
+  metadata.gz: e00e4960ca30076bcb01e4a5c4232614a9640a5a281d3e87a6e5e77209649ebc23f45bea1d02cc2f3040ce70d60c0b882b6cde261f48eb4f1627210ed8c45e1f
+  data.tar.gz: 6a41cd905dca14cee141829067e5355133304d4179bc045dc572134f152668400b6c5472fad0891117fd943650870d13a9a7aace2d984e6c7275d4511c18f595

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.3
+
+* Bugfix to allow rspec support to work with current Cog::Bundle API
+* Bugfix to skip creation of intermediate modules in the command hierarchy if they are already defined
+
 ## 0.3.2
 
 The 0.3.1 release inadvertently omitted the `docker:release` task. This has been corrected.

data/lib/cog/bundle.rb

@@ -9,9 +9,15 @@ class Cog
     end
 
     def create_bundle_module
-      return if Object.const_defined?('CogCmd')
-      Object.const_set('CogCmd', Module.new)
-      CogCmd.const_set(@name.capitalize, Module.new)
+      module_name = @name.capitalize
+
+      Object.const_set('CogCmd', Module.new) unless Object.const_defined?('CogCmd')
+
+      if CogCmd.const_defined?(module_name)
+        CogCmd.const_get(module_name)
+      else
+        CogCmd.const_set(module_name, Module.new)
+      end
     end
 
     def command_instance(command_name)

data/lib/cog/version.rb

@@ -1,3 +1,3 @@
 class Cog
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/rspec/cog/setup.rb

@@ -33,20 +33,13 @@ module Cog::RSpec::Setup
     # This is `let!` instead of `let` because this call actually
     # *creates* the bundle module that our commands live in; we want
     # to ensure that this gets called before we start doing anything else
-    Cog::Bundle.new(bundle_name, base_dir: base_dir, config_file: config_file)
+    Cog::Bundle.new(bundle_name, base_dir: base_dir)
   end
 
   let(:command_name){ raise "Must supply a :command_name!" }
 
   let(:command) do
-    # 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
+    bundle.command_instance(command_name)
   end
 
   let(:invocation_id) { SecureRandom.uuid }

data/lib/tasks/cog.rake

@@ -1,10 +1,10 @@
-config_file = FileList.new('config.y?ml').first
+config_file = FileList.new("config.y*ml").first
 config = Cog::Config.new(config_file)
 docker_image = config['docker'].nil? ? nil : "#{config['docker']['image']}:#{config['docker']['tag']}"
 
 namespace :template do
   desc "Update templates in configuration file"
-  task :update do
+  task :update, [ :mode ] do |t, args|
     puts "Current bundle configuration version is #{config['version']}."
 
     templates = FileList.new('templates/*')
@@ -26,7 +26,7 @@ namespace :template do
     end
 
     if config.stale?
-      config.update_version
+      config.update_version unless args[:mode] == 'dev'
       puts "Writing new configuration file for version #{config['version']}."
       config.save
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cog-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Mark Imbriaco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake