diff --git a/Gemfile b/Gemfile index 7abbf60..15bcabe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,4 @@ source 'https://rubygems.org' -gem 'formatador', '~> 0.2.4' - # Specify your gem's dependencies in escort.gemspec gemspec diff --git a/lib/escort/app.rb b/lib/escort/app.rb index 4fb1a61..0db5d20 100644 --- a/lib/escort/app.rb +++ b/lib/escort/app.rb @@ -17,8 +17,8 @@ def initialize(global_setup) if @configuration.nil? #create a default config file if autocreate is true #default_config_file_data = {} - blah = Escort::Setup::DefaultConfigurationData.new(app, global_setup_accessor).generate - p blah + blah = Escort::Setup::DefaultConfigurationData.new(self, global_setup_accessor).generate + puts JSON.pretty_generate blah #global_setup_accessor.command_aliases.each_pair do |command_name, aliases| #current_command_setup = Escort::Setup::Command.new(global_setup) #@global_setup = global_setup diff --git a/lib/escort/setup/default_configuration_data.rb b/lib/escort/setup/default_configuration_data.rb index 54fc250..900875f 100644 --- a/lib/escort/setup/default_configuration_data.rb +++ b/lib/escort/setup/default_configuration_data.rb @@ -42,7 +42,7 @@ def default_option_values_for_commands def default_command_option_values(command_name) hash = {} - command_block = ensure_command_block(@command_name) + command_block = ensure_command_block(command_name) command_setup = BareCommand.new command_block.call(command_setup) hash