best_practice_project 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7476699c6b4511029adeecf0d84827384f943a9b
-  data.tar.gz: d21a33dcb8e43f164cdc06446d061c299da1bedf
+  metadata.gz: f6a03a30e37d96eb2b4c872098a93d1715184fbf
+  data.tar.gz: 3ef0ccbf70a7a5eb44c0c6027ba6e7cc0e2425a4
 SHA512:
-  metadata.gz: e7a57f1f55926c87e7a2b11741b6c5b1bf8b88d85b9caf66f7c2b6f3d8c005b623232003dc014abd0d88cade9e8a100c027a24ce3927ad24db950ee54a4ef7d1
-  data.tar.gz: 412447dde027d00e4d9fecfd4d9994ad709c5eb93dc1354a9dcf4c780762951fe8597c75925d88cf9986feeaa9cbdd41e1d432971542869eeca26b36b6db5412
+  metadata.gz: 8eab271030250e7d4eaa943be8e89584498089cafcb0b349027e31f12d5ded5c829b3298589744cac06d3660ec078a202aa9e34d6f55b206b7aafcea0c6836c5
+  data.tar.gz: 524dd44b8db85126d4eaeb5888af61e19f2b55bfca0fada7d2371bfe39403e4401c7a500055a13254470df537da8caa039dee7a351bd1a2e9b241ff073864162

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/best_practice_project.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: best_practice_project 0.0.2 ruby lib
+# stub: best_practice_project 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "best_practice_project"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "best_practice_project.gemspec",
     "lib/best_practice_project.rb",
+    "lib/best_practice_project/config/rubocop.yml",
     "lib/best_practice_project/rubocop_handler.rb",
-    "lib/config/rubocop.yml",
     "lib/tasks/best_practice_project.rake",
     "shippable.yml",
     "spec/best_practice_project_spec.rb",

data/lib/best_practice_project/rubocop_handler.rb

@@ -1,7 +1,7 @@
 class BestPracticeProject::RubocopHandler
   def initialize(args)
     @bpp = args.fetch(:best_practice_project)
-    @actual_config_path = File.realpath("#{File.dirname(__FILE__)}/../../config/rubocop.yml")
+    @actual_config_path = File.realpath("#{File.dirname(__FILE__)}/config/rubocop.yml")
 
     if rails?
       @config_path = Rails.root.join("config", "rubocop.yml").to_s
@@ -47,6 +47,8 @@ class BestPracticeProject::RubocopHandler
       fp.write(YAML.dump(generated_config))
     end
 
+    reset_best_practice_path
+
     puts "Generated Rubocop config in  #{@config_path}"
   end
 
@@ -63,7 +65,10 @@ class BestPracticeProject::RubocopHandler
       File.rename(todo_file_path, todo_backup_file_path)
     end
 
-    system("rubocop --rails --display-cop-names --auto-gen-config --config=#{@actual_config_path}")
+    rubocop_command = "rubocop --display-cop-names --auto-gen-config --config=#{@actual_config_path}"
+    rubocop_command << " --rails" if @bpp.rails?
+
+    system(rubocop_command)
 
     raise "Todo-file was not generated" unless File.exist?(todo_file_path)
 
@@ -88,7 +93,23 @@ private
 
   def inherit_from_to=(new_inherit_from)
     todo_config = File.read(@todo_path)
-    todo_config.gsub!(/^inherit_from: (.+)$/, "inherit_from: \"#{new_inherit_from}\"")
+
+    replace_with = "inherit_from: \"#{new_inherit_from}\""
+
+    if todo_config.include?("inherit_from:")
+      replace_what = /^inherit_from: (.+)$/
+    elsif todo_config.start_with?("---\n")
+      replace_what = /\A---\n/
+      replace_with.prepend("---\n")
+      replace_with << "\n\n"
+    else
+      replace_what = /\A/
+      replace_with << "\n\n"
+    end
+
+    todo_config.gsub!(replace_what, replace_with)
+
+    raise "Couldn't insert dynamic config" unless todo_config.include?(replace_with)
 
     File.open(@todo_path, "w") do |fp|
       fp.write(todo_config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_practice_project
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kaspernj
@@ -112,8 +112,8 @@ files:
 - VERSION
 - best_practice_project.gemspec
 - lib/best_practice_project.rb
+- lib/best_practice_project/config/rubocop.yml
 - lib/best_practice_project/rubocop_handler.rb
-- lib/config/rubocop.yml
 - lib/tasks/best_practice_project.rake
 - shippable.yml
 - spec/best_practice_project_spec.rb