From 4571fdb96ba140c99c45ed76b09c3a213f3e855f Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Tue, 10 Jan 2017 17:32:31 +0900 Subject: [PATCH] Make cosmetic changes in generator --- .rubocop.yml | 3 +++ script/generate | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index d618bee6..1cf137ab 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -79,3 +79,6 @@ Style/CollectionMethods: inject: "inject" detect: "find" find_all: "select" + +Style/PerlBackrefs: + Enabled: false diff --git a/script/generate b/script/generate index ddc6ec95..c91fa75d 100755 --- a/script/generate +++ b/script/generate @@ -11,7 +11,10 @@ Example: EOS def camelize(string) - string.sub(/^[a-z\d]*/) { |match| match.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/'.freeze, '::'.freeze) + string + .sub(/^[a-z\d]*/) { |match| match.capitalize } + .gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" } + .gsub('/'.freeze, '::'.freeze) end def generate_resource_erb(resource) @@ -30,9 +33,14 @@ def generate_resource_spec_rb(resource) end def humanize(string) - string.sub(/\A_+/, ''.freeze).sub(/_id\z/, ''.freeze).tr('_'.freeze, ' '.freeze).gsub(/([a-z\d]*)/i) do |match| - match.downcase - end.split(" ").map{ |w| w[0].upcase + w[1..-1] }.join(" ") + string + .sub(/\A_+/, ''.freeze) + .sub(/_id\z/, ''.freeze) + .tr('_'.freeze, ' '.freeze) + .gsub(/([a-z\d]*)/i) { |match| match.downcase } + .split(" ") + .map { |w| w[0].upcase + w[1..-1] } + .join(" ") end @@ -50,7 +58,7 @@ File.open(File.join("lib", "terraforming", "resource", "#{resource}.rb"), "w+") puts "==> Generate #{resource}_spec.rb" resource_spec_rb = generate_resource_spec_rb(resource) -File.open(File.join("spec", "lib", "terraforming", "resource", "#{resource}_spec.rb"), "w+") { |f| f.write(resource_rb)} +File.open(File.join("spec", "lib", "terraforming", "resource", "#{resource}_spec.rb"), "w+") { |f| f.write(resource_rb) } puts "==> Generate #{resource}.erb" resource_erb = generate_resource_erb(resource) @@ -81,7 +89,7 @@ spec/lib/terraforming/cli_spec.rb: describe CLI do context "resources" do describe "#{resource}" do - let(:klass) { Terraforming::Resource::#{camelize(resource) } + let(:klass) { Terraforming::Resource::#{camelize(resource)} } let(:command) { :#{resource} } it_behaves_like "CLI examples"