convoy 1.1.0 → 1.2.0

data/lib/convoy/setup/configuration/generator.rb

@@ -21,10 +21,10 @@ module Convoy
                     commands.each do |command_name|
                         command_name = command_name.to_sym
                         #next if command_name == :convoy
-                        options[command_name] = {}
-                        options[command_name][:options] = {}
+                        options[command_name]            = {}
+                        options[command_name][:options]  = {}
                         options[command_name][:commands] = {}
-                        current_context = context.dup
+                        current_context                  = context.dup
                         current_context << command_name
                         options(current_context, options[command_name][:options]) #command_options
                         options_for_commands(setup.canonical_command_names_for(current_context), current_context, options[command_name][:commands])
@@ -34,17 +34,17 @@ module Convoy
                 def init_config_hash
                     {
                         :global => {
-                            :options => {},
+                            :options  => {},
                             :commands => {}
                         },
-                        :user => {}
+                        :user   => {}
                     }
                 end
 
                 def options(context = [], options = {})
                     command_names = setup.command_names_for(context)
-                    parser = init_parser(command_names)
-                    parser = add_setup_options_to(parser, context)
+                    parser        = init_parser(command_names)
+                    parser        = add_setup_options_to(parser, context)
                     options.merge!(default_option_values(parser))
                 end
 

data/lib/convoy/setup/configuration/loader.rb

@@ -5,7 +5,7 @@ module Convoy
                 attr_reader :setup, :auto_options
 
                 def initialize(setup, auto_options)
-                    @setup = setup
+                    @setup        = setup
                     @auto_options = auto_options
                 end
 

data/lib/convoy/setup/configuration/locator/executing_script_directory.rb

@@ -5,7 +5,7 @@ module Convoy
                 class ExecutingScriptDirectory < Base
                     def locate
                         location_directory = File.dirname($0)
-                        filepath = File.expand_path(File.join(location_directory, filename))
+                        filepath           = File.expand_path(File.join(location_directory, filename))
                         File.exists?(filepath) ? filepath : nil
                     end
                 end

data/lib/convoy/setup/dsl/command.rb

@@ -4,8 +4,8 @@ module Convoy
             class Command
                 def initialize(name, options = {}, &block)
                     reset(name)
-                    @description = options[:description] || options[:desc] || ""
-                    @aliases = [options[:aliases] || []].flatten
+                    @description        = options[:description] || options[:desc] || ""
+                    @aliases            = [options[:aliases] || []].flatten
                     @requires_arguments ||= options[:requires_arguments]
                     block.call(self) if block_given?
                 rescue => e
@@ -22,8 +22,8 @@ module Convoy
 
                 def command(name, options = {}, &block)
                     options[:requires_arguments] = @requires_arguments
-                    command = Command.new(name.to_sym, options, &block)
-                    aliases = [options[:aliases] || []].flatten + [name]
+                    command                      = Command.new(name.to_sym, options, &block)
+                    aliases                      = [options[:aliases] || []].flatten + [name]
                     aliases.each do |name|
                         @commands[name.to_sym] = command
                     end
@@ -48,13 +48,13 @@ module Convoy
                 private
 
                 def reset(name)
-                    @name = name
-                    @summary = nil
-                    @description = nil
+                    @name               = name
+                    @summary            = nil
+                    @description        = nil
                     @requires_arguments = false
-                    @commands = {}
-                    @options = Options.new(name)
-                    @action = Action.new(name)
+                    @commands           = {}
+                    @options            = Options.new(name)
+                    @action             = Action.new(name)
                     custom_reset
                 end
 

data/lib/convoy/setup/dsl/global.rb

@@ -20,7 +20,7 @@ module Convoy
                 private
 
                 def custom_reset
-                    @version = nil
+                    @version     = nil
                     @config_file = nil
                 end
             end

data/lib/convoy/setup/dsl/options.rb

@@ -12,14 +12,14 @@ module Convoy
 
                 def initialize(command_name = :global)
                     @command_name = command_name
-                    @options = {}
+                    @options      = {}
                     @dependencies = {}
-                    @conflicts = {}
-                    @validations = {}
+                    @conflicts    = {}
+                    @validations  = {}
                 end
 
                 def opt(name, desc="", opts={})
-                    opts[:desc] ||= desc
+                    opts[:desc]    ||= desc
                     @options[name] ||= opts
                     dependency(name, :on => opts[:depends_on]) if opts[:depends_on]
                     conflict(*[name, opts[:conflicts_with]].flatten) if opts[:conflicts_with]
@@ -27,7 +27,7 @@ module Convoy
 
                 def validate(name, description, &block)
                     @validations[name] ||= []
-                    @validations[name] << {:desc => description, :block => block}
+                    @validations[name] << { :desc => description, :block => block }
                 end
 
                 def dependency(option_name, opts = {})
@@ -42,8 +42,8 @@ module Convoy
                 def conflict(*opts)
                     opts.each do |opt|
                         conflicts_for_opt = opts.reject { |value| value == opt }
-                        @conflicts[opt] ||= []
-                        @conflicts[opt] += conflicts_for_opt
+                        @conflicts[opt]   ||= []
+                        @conflicts[opt]   += conflicts_for_opt
                         @conflicts[opt].uniq!
                     end
                 end

data/lib/convoy/setup_accessor.rb

@@ -98,7 +98,7 @@ module Convoy
 
         def command_aliases_for(command_name, context = [])
             with_context(context) do |current_context|
-                commands = fetch_instance_variable_from(current_context, :commands)
+                commands    = fetch_instance_variable_from(current_context, :commands)
                 description = fetch_instance_variable_from(commands[command_name], :aliases)
             end
         end
@@ -121,11 +121,11 @@ module Convoy
         end
 
         def with_context(context = [], &block)
-            context = [] if context.nil? || context.empty?
-            context = [context] unless context.kind_of?(Array)
+            context         = [] if context.nil? || context.empty?
+            context         = [context] unless context.kind_of?(Array)
             current_context = global_instance
             context.each do |command_name|
-                commands = fetch_instance_variable_from(current_context, :commands)
+                commands        = fetch_instance_variable_from(current_context, :commands)
                 current_context = commands[command_name.to_sym]
             end
             block.call(current_context)
@@ -137,7 +137,7 @@ module Convoy
 
         def action_block_from(context_object)
             action_object = fetch_instance_variable_from(context_object, :action)
-            block = fetch_instance_variable_from(action_object, :block)
+            block         = fetch_instance_variable_from(action_object, :block)
             #TODO make sure that if there is no block we exit with a client error
         end
 

data/lib/convoy/trollop.rb

@@ -60,7 +60,7 @@ module Trollop
         ## The complete set of legal values for the +:type+ parameter of #opt.
         TYPES = FLAG_TYPES + SINGLE_ARG_TYPES + MULTI_ARG_TYPES
 
-        INVALID_SHORT_ARG_REGEX = /[\d-]/ #:nodoc:
+        INVALID_SHORT_ARG_REGEX = /[-]/ #:nodoc:
 
         ## The values from the commandline that were not interpreted by #parse.
         attr_reader :leftovers
@@ -73,16 +73,16 @@ module Trollop
 
         ## Initializes the parser, and instance-evaluates any block given.
         def initialize *a, &b
-            @version = nil
-            @leftovers = []
-            @specs = {}
-            @long = {}
-            @short = {}
-            @order = []
-            @constraints = []
-            @stop_words = []
+            @version         = nil
+            @leftovers       = []
+            @specs           = {}
+            @long            = {}
+            @short           = {}
+            @order           = []
+            @constraints     = []
+            @stop_words      = []
             @stop_on_unknown = false
-            @help_formatter = nil
+            @help_formatter  = nil
 
             #instance_eval(&b) if b # can't take arguments
             cloaker(&b).bind(self).call(*a) if b
@@ -257,10 +257,10 @@ module Trollop
             ## fill in :multi
             opts[:multi] ||= false
 
-            opts[:desc] ||= desc
-            @long[opts[:long]] = name
+            opts[:desc]          ||= desc
+            @long[opts[:long]]   = name
             @short[opts[:short]] = name if opts[:short] && opts[:short] != :none
-            @specs[name] = opts
+            @specs[name]         = opts
             @order << [:opt, name]
         end
 
@@ -327,7 +327,7 @@ module Trollop
         ##
         ## throws CommandlineError, HelpNeeded, and VersionNeeded exceptions.
         def parse cmdline=ARGV
-            vals = {}
+            vals     = {}
             required = {}
 
             opt :version, 'Prints version and exits' if @version unless @specs[:version] || @long['version']
@@ -335,8 +335,8 @@ module Trollop
 
             @specs.each do |sym, opts|
                 required[sym] = true if opts[:required]
-                vals[sym] = opts[:default]
-                vals[sym] = [] if opts[:multi] && !opts[:default] # multi arguments default to [], not nil
+                vals[sym]     = opts[:default]
+                vals[sym]     = [] if opts[:multi] && !opts[:default] # multi arguments default to [], not nil
             end
 
             resolve_default_short_options!
@@ -358,7 +358,7 @@ module Trollop
                               @long[$1] || @long["no-#{$1}"]
                           else
                               #  raise CommandlineError, "invalid argument syntax: '#{arg}'"
-                              puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Invalid argument syntax: #{arg}\n\n"
+                              puts "\n    \x1B[48;5;196m Error \x1B[0m \xe2\x86\x92 Invalid argument syntax: #{arg}\n\n"
                               exit
                       end
 
@@ -366,20 +366,20 @@ module Trollop
 
                 # raise CommandlineError, "unknown argument '#{arg}'" unless sym
                 unless sym
-                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Unknown flag: #{arg}\n\n"
+                    puts "\n    \x1B[48;5;196m Error \x1B[0m \xe2\x86\x92 Unknown flag: #{arg}\n\n"
                     exit
                 end
 
                 if given_args.include?(sym) && !@specs[sym][:multi]
                     # raise CommandlineError, "option '#{arg}' specified multiple times"
-                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Flag specified multiple times: #{arg}\n\n"
+                    puts "\n    \x1B[48;5;196m Error \x1B[0m \xe2\x86\x92 Flag specified multiple times: #{arg}\n\n"
                     exit
                 end
 
-                given_args[sym] ||= {}
-                given_args[sym][:arg] = arg
+                given_args[sym]                  ||= {}
+                given_args[sym][:arg]            = arg
                 given_args[sym][:negative_given] = negative_given
-                given_args[sym][:params] ||= []
+                given_args[sym][:params]         ||= []
 
                 # The block returns the number of parameters taken.
                 num_params_taken = 0
@@ -408,14 +408,20 @@ module Trollop
 
                 case type
                     when :depends
-                        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}" unless given_args.include? sym }
+                        syms.each { |sym|
+                            Blufin::Terminal::error('Missing constraint', "--#{@specs[constraint_sym][:long]} requires --#{@specs[sym][:long]}") unless given_args.include? sym
+                        }
                     when :conflicts
-                        syms.each { |sym| raise CommandlineError, "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}" if given_args.include?(sym) && (sym != constraint_sym) }
+                        syms.each { |sym|
+                            Blufin::Terminal::error('Conflicting constraint', "--#{@specs[constraint_sym][:long]} conflicts with --#{@specs[sym][:long]}") if given_args.include?(sym) && (sym != constraint_sym)
+                        }
                 end
             end
 
             required.each do |sym, val|
-                raise CommandlineError, "option --#{@specs[sym][:long]} must be specified" unless given_args.include? sym
+                unless given_args.include? sym
+                    Blufin::Terminal::error('Missing option', "option --#{@specs[sym][:long]} must be specified")
+                end
             end
 
             ## parse parameters
@@ -423,7 +429,10 @@ module Trollop
                 arg, params, negative_given = given_data.values_at :arg, :params, :negative_given
 
                 opts = @specs[sym]
-                raise CommandlineError, "option '#{arg}' needs a parameter" if params.empty? && opts[:type] != :flag
+
+                if params.empty? && opts[:type] != :flag
+                    Blufin::Terminal::error('Missing parameter', "option '#{arg}' needs a parameter")
+                end
 
                 vals["#{sym}_given".intern] = true # mark argument as specified on the commandline
 
@@ -516,7 +525,7 @@ module Trollop
                     end
             end
 
-            leftcol_width = left.values.map { |s| s.length }.max || 0
+            leftcol_width  = left.values.map { |s| s.length }.max || 0
             rightcol_start = leftcol_width + 6 # spaces
 
             unless @order.size > 0 && @order.first.first == :text
@@ -600,7 +609,7 @@ module Trollop
         ## yield successive arg, parameter pairs
         def each_arg args
             remains = []
-            i = 0
+            i       = 0
 
             until i >= args.length
                 if @stop_words.member? args[i]
@@ -695,7 +704,7 @@ module Trollop
 
         def collect_argument_parameters args, start_at
             params = []
-            pos = start_at
+            pos    = start_at
             while args[pos] && args[pos] !~ PARAM_RE && !@stop_words.member?(args[pos]) do
                 params << args[pos]
                 pos += 1
@@ -712,16 +721,16 @@ module Trollop
                 c = opts[:long].split(//).find { |d| d !~ INVALID_SHORT_ARG_REGEX && !@short.member?(d) }
                 if c # found a character to use
                     opts[:short] = c
-                    @short[c] = name
+                    @short[c]    = name
                 end
             end
         end
 
         def wrap_line str, opts={}
             prefix = opts[:prefix] || 0
-            width = opts[:width] || (self.width - 1)
-            start = 0
-            ret = []
+            width  = opts[:width] || (self.width - 1)
+            start  = 0
+            ret    = []
             until start > str.length
                 nextt =
                     if start + width >= str.length

data/lib/convoy/utils.rb

@@ -5,8 +5,8 @@ module Convoy
         class << self
             def symbolize_keys(hash)
                 hash.inject({}) do |result, (key, value)|
-                    new_key = (key.kind_of?(String) ? key.to_sym : key)
-                    new_value = (value.kind_of?(Hash) ? symbolize_keys(value) : value)
+                    new_key         = (key.kind_of?(String) ? key.to_sym : key)
+                    new_value       = (value.kind_of?(Hash) ? symbolize_keys(value) : value)
                     result[new_key] = new_value
                     result
                 end

data/spec/integration/basic_config_file_spec.rb

@@ -35,7 +35,7 @@ describe "Convoy basic app with config file defined", :integration => true do
         context "and config file already exists" do
             before do
                 FileUtils.mkdir_p(File.dirname path)
-                File.open(path, 'w') { |f| f.write(JSON.pretty_generate({:global => {:commands => {}, :options => {:option1 => 'hello'}}, :user => {}})) }
+                File.open(path, 'w') { |f| f.write(JSON.pretty_generate({ :global => { :commands => {}, :options => { :option1 => 'hello' } }, :user => {} })) }
 
                 begin
                     subject
@@ -55,7 +55,7 @@ describe "Convoy basic app with config file defined", :integration => true do
             let(:option_string) { "" }
             before do
                 FileUtils.mkdir_p(File.dirname path)
-                File.open(path, 'w') { |f| f.write(JSON.pretty_generate({:global => {:commands => {}, :options => {:option1 => 'hello'}}, :user => {}})) }
+                File.open(path, 'w') { |f| f.write(JSON.pretty_generate({ :global => { :commands => {}, :options => { :option1 => 'hello' } }, :user => {} })) }
 
                 begin
                     subject
@@ -85,7 +85,7 @@ describe "Convoy basic app with config file defined", :integration => true do
 
         before do
             FileUtils.mkdir_p(File.dirname path)
-            File.open(path, 'w') { |f| f.write(JSON.pretty_generate({:global => {:commands => {}, :options => {:option1 => 'hello'}}, :user => {}})) }
+            File.open(path, 'w') { |f| f.write(JSON.pretty_generate({ :global => { :commands => {}, :options => { :option1 => 'hello' } }, :user => {} })) }
 
             begin
                 subject

data/spec/integration/basic_depends_on_spec.rb

@@ -137,7 +137,7 @@ describe "Convoy basic app with dependent options", :integration => true do
                     opts.opt :option1, "Option1", :short => '-o', :long => '--option1', :type => :string
                     opts.opt :option2, "Option2", :short => :none, :long => '--option2', :type => :string, :multi => true
 
-                    opts.dependency :option2, :on => {:option1 => 'bar'}
+                    opts.dependency :option2, :on => { :option1 => 'bar' }
                 end
 
                 app.action do |options, arguments|
@@ -170,7 +170,7 @@ describe "Convoy basic app with dependent options", :integration => true do
                     opts.opt :option1, "Option1", :short => '-o', :long => '--option1', :type => :string
                     opts.opt :option2, "Option2", :short => :none, :long => '--option2', :type => :string, :multi => true
 
-                    opts.dependency :option2, :on => [:flag1, {:option1 => 'bar'}]
+                    opts.dependency :option2, :on => [:flag1, { :option1 => 'bar' }]
                 end
 
                 app.action do |options, arguments|

data/spec/lib/convoy/action_command/base_spec.rb

@@ -22,27 +22,27 @@ describe Convoy::SetupAccessor do
 
             context "and options hash is of valid structure" do
                 context "and command is global" do
-                    let(:options) { {:global => {:commands => {}}} }
+                    let(:options) { { :global => { :commands => {} } } }
                     it { subject.should == [] }
                 end
 
                 context "and command is child of global" do
-                    let(:options) { {:global => {:commands => {:command1 => {:commands => {}}}}} }
+                    let(:options) { { :global => { :commands => { :command1 => { :commands => {} } } } } }
                     it { subject.should == [:command1] }
 
                     context "and no commands hash for sub command in options" do
-                        let(:options) { {:global => {:commands => {:command1 => {}}}} }
+                        let(:options) { { :global => { :commands => { :command1 => {} } } } }
                         it { subject.should == [:command1] }
                     end
                 end
 
                 context "and command is grandchild of global" do
-                    let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {}}}}}}} }
+                    let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => {} } } } } } } }
                     it { subject.should == [:command1, :sub_command1] }
                 end
 
                 context "and command is great grandchild of global" do
-                    let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {:sub_sub_command1 => {:commands => {}}}}}}}}} }
+                    let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => { :sub_sub_command1 => { :commands => {} } } } } } } } } }
                     it { subject.should == [:command1, :sub_command1, :sub_sub_command1] }
                 end
             end
@@ -53,17 +53,17 @@ describe Convoy::SetupAccessor do
         subject { command.send(:command_name) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}}} }
+            let(:options) { { :global => { :commands => {} } } }
             it { subject.should == :global }
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}}}}} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {} } } } } }
             it { subject.should == :command1 }
         end
 
         context "when context is of size 2" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {}}}}}}} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => {} } } } } } } }
             it { subject.should == :sub_command1 }
         end
     end
@@ -72,18 +72,18 @@ describe Convoy::SetupAccessor do
         subject { command.send(:command_options) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}, :options => {:hello => :world}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => {}, :options => { :hello => :world } } } }
+            it { subject.should == { :hello => :world } }
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}, :options => {:hello => :world}}}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {}, :options => { :hello => :world } } } } } }
+            it { subject.should == { :hello => :world } }
         end
 
         context "when context is of size 2" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {}, :options => {:hello => :world}}}}}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => {}, :options => { :hello => :world } } } } } } } }
+            it { subject.should == { :hello => :world } }
         end
     end
 
@@ -91,13 +91,13 @@ describe Convoy::SetupAccessor do
         subject { command.send(:global_options) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}, :options => {:hello => :world}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => {}, :options => { :hello => :world } } } }
+            it { subject.should == { :hello => :world } }
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}}}, :options => {:hello => :world}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {} } }, :options => { :hello => :world } } } }
+            it { subject.should == { :hello => :world } }
         end
     end
 
@@ -105,18 +105,18 @@ describe Convoy::SetupAccessor do
         subject { command.send(:parent_options) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}, :options => {:hello => :world}}} }
+            let(:options) { { :global => { :commands => {}, :options => { :hello => :world } } } }
             it { subject.should == {} }
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}}}, :options => {:hello => :world}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {} } }, :options => { :hello => :world } } } }
+            it { subject.should == { :hello => :world } }
         end
 
         context "when context is of size 2" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {}}}, :options => {:hello => :world}}}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => {} } }, :options => { :hello => :world } } } } } }
+            it { subject.should == { :hello => :world } }
         end
     end
 
@@ -124,18 +124,18 @@ describe Convoy::SetupAccessor do
         subject { command.send(:grandparent_options) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}, :options => {:hello => :world}}} }
+            let(:options) { { :global => { :commands => {}, :options => { :hello => :world } } } }
             it { subject.should == {} }
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}}}, :options => {:hello => :world}}} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {} } }, :options => { :hello => :world } } } }
             it { subject.should == {} }
         end
 
         context "when context is of size 2" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {:sub_command1 => {:commands => {}}}}}, :options => {:hello => :world}}} }
-            it { subject.should == {:hello => :world} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => { :sub_command1 => { :commands => {} } } } }, :options => { :hello => :world } } } }
+            it { subject.should == { :hello => :world } }
         end
     end
 
@@ -143,11 +143,11 @@ describe Convoy::SetupAccessor do
         subject { command.send(:ancestor_options, generation_number) }
 
         context "when context is global" do
-            let(:options) { {:global => {:commands => {}, :options => {:hello => :world}}} }
+            let(:options) { { :global => { :commands => {}, :options => { :hello => :world } } } }
 
             context "and generation number is 0" do
                 let(:generation_number) { 0 }
-                it { subject.should == {:hello => :world} }
+                it { subject.should == { :hello => :world } }
             end
 
             context "and generation number is 1" do
@@ -167,16 +167,16 @@ describe Convoy::SetupAccessor do
         end
 
         context "when context is of size 1" do
-            let(:options) { {:global => {:commands => {:command1 => {:commands => {}, :options => {:foo => :bar}}}, :options => {:hello => :world}}} }
+            let(:options) { { :global => { :commands => { :command1 => { :commands => {}, :options => { :foo => :bar } } }, :options => { :hello => :world } } } }
 
             context "and generation number is 0" do
                 let(:generation_number) { 0 }
-                it { subject.should == {:foo => :bar} }
+                it { subject.should == { :foo => :bar } }
             end
 
             context "and generation number is 1" do
                 let(:generation_number) { 1 }
-                it { subject.should == {:hello => :world} }
+                it { subject.should == { :hello => :world } }
             end
 
             context "and generation number is 2" do