hypercuke 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df7dbaea6ea4f5665a5f0e698e677f27fa3d9fd
-  data.tar.gz: 1334aa38a72f29866cff7c844808b59454809a00
+  metadata.gz: e4fc2de2d9d06dbc60cbc06eaf8e44cb624170dc
+  data.tar.gz: 5182b28d65f9ac1e584ca20a994b7a3dd75a92f4
 SHA512:
-  metadata.gz: 8e8ac55bd1d0e6773d148aa7e949904a1c90b171ce6b01e26e48dc40969386b46e317a69fc8ea2f5fe0922304576884ce99dd9ef334fcc289b2edddf2e8c0111
-  data.tar.gz: ee444352aaef8664bd45206b3485c60402cbb31754033446d8f9526805b1e1d9597952383c7267ef4b5a4feb450ee9fed452542ee76c4ed2308b32f7f1afa7f2
+  metadata.gz: e89acf6fd6fbbd1519491b92dc9bc077254c79c16aea0efb4def0288a8e0927a019ae5e3b2f75fc46d65362d96cc501f43b831c4161140bc0c4df02d25d8f4db
+  data.tar.gz: 9caab6bdaad88e2f92790c4c3b5f14734548f17a0d3a90a2a6ad88d7f1124eca8fac988ff8facde00c2f7f2d11227f4f5fb3d01e079c894d55241284fc64c680

data/lib/hypercuke/cli/builder.rb

@@ -35,9 +35,10 @@ module Hypercuke
       end
 
       def layer_tag_for_mode
-        layer = options[:layer_name]
-        mode  = options[:mode] || 'ok'
-        '@%s_%s' % [ layer, mode ]
+        layer = options.fetch(:layer_name)
+        mode  = options[:mode]
+        blank_or_ok = ->(e) { e.to_s =~ /^(\s*|ok)$/ }
+        '@' + [ layer, mode ].reject(&blank_or_ok).join('_')
       end
 
       def add_profile_unless_already_present

data/lib/hypercuke/version.rb

@@ -1,3 +1,3 @@
 module Hypercuke
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/cli_spec.rb

@@ -6,20 +6,20 @@ require 'spec_helper'
   (Assume that the --require business is handled in cucumber.yml.)
 
   Some sample HCu commands and their expected outputs:
-  $ hcu core      # cucumber --tags @core_ok
-  $ hcu model     # cucumber --tags @model_ok
+  $ hcu core      # cucumber --tags @core
+  $ hcu model     # cucumber --tags @model
   $ hcu core wip  # cucumber --tags @model_wip --profile wip
-  $ hcu core ok   # cucumber --tags @core_ok
+  $ hcu core ok   # cucumber --tags @core
 
   If the user specifies a --profile tag, assume they know what they're doing...
-  $ hcu core --profile emperor_penguin     # cucumber --tags @core_ok --profile emperor_penguin
+  $ hcu core --profile emperor_penguin     # cucumber --tags @core --profile emperor_penguin
   $ hcu core wip --profile emperor_penguin # cucumber --tags @core_wip --profile emperor_penguin
   ...even if they use the "-p" tag instead...
-  $ hcu core -p emperor_penguin     # cucumber --tags @core_ok --profile emperor_penguin
+  $ hcu core -p emperor_penguin     # cucumber --tags @core --profile emperor_penguin
   $ hcu core wip -p emperor_penguin # cucumber --tags @core_wip --profile emperor_penguin
 
   Everything else should just get passed through to Cucumber unmangled.
-  $ hcu core --wibble # cucumber --tags @core_ok --wibble
+  $ hcu core --wibble # cucumber --tags @core --wibble
 
   Also, the '-h' flag should display HCu help (TBD)
   ( TODO: WRITE THIS EXAMPLE? )
@@ -48,13 +48,13 @@ expected: #{expected_output.inspect}
       end
 
       it "ignores the 0th 'hcu' argument in its various forms (does this even happen?)" do
-        expect_command_line 'hcu core',     "#{cmd_base} --tags @core_ok"
-        expect_command_line 'bin/hcu core', "#{cmd_base} --tags @core_ok"
+        expect_command_line 'hcu core',     "#{cmd_base} --tags @core"
+        expect_command_line 'bin/hcu core', "#{cmd_base} --tags @core"
       end
 
       it "treats the first argument as a layer name and adds the appropriate --tags flag" do
-        expect_command_line 'core',  "#{cmd_base} --tags @core_ok"
-        expect_command_line 'model', "#{cmd_base} --tags @model_ok"
+        expect_command_line 'core',  "#{cmd_base} --tags @core"
+        expect_command_line 'model', "#{cmd_base} --tags @model"
       end
 
       it "barfs if the layer name is not given" do
@@ -63,7 +63,7 @@ expected: #{expected_output.inspect}
       end
 
       it "treats the second argument as a mode (assuming it doesn't start with a dash)" do
-        expect_command_line 'core ok',  "#{cmd_base} --tags @core_ok"
+        expect_command_line 'core ok',  "#{cmd_base} --tags @core"
       end
 
       it "adds '--profile wip' when the mode is 'wip'" do
@@ -71,13 +71,13 @@ expected: #{expected_output.inspect}
       end
 
       it "ignores most other arguments and just hands them off to Cucumber" do
-        expect_command_line 'core --wibble',    "#{cmd_base} --tags @core_ok --wibble"
-        expect_command_line 'core ok --wibble', "#{cmd_base} --tags @core_ok --wibble"
+        expect_command_line 'core --wibble',    "#{cmd_base} --tags @core --wibble"
+        expect_command_line 'core ok --wibble', "#{cmd_base} --tags @core --wibble"
       end
 
       it "doesn't override a profile if the user explicitly specifies one (using either -p or --profile)" do
-        expect_command_line 'core --dingbat --profile emperor_penguin',     "#{cmd_base} --tags @core_ok --profile emperor_penguin --dingbat"
-        expect_command_line 'core --dingbat -p emperor_penguin',            "#{cmd_base} --tags @core_ok --profile emperor_penguin --dingbat"
+        expect_command_line 'core --dingbat --profile emperor_penguin',     "#{cmd_base} --tags @core --profile emperor_penguin --dingbat"
+        expect_command_line 'core --dingbat -p emperor_penguin',            "#{cmd_base} --tags @core --profile emperor_penguin --dingbat"
       end
 
       it "doesn't override a user-specified profile, even in wip mode when it would normally use the wip profile" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypercuke
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sam Livingston-Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement