synvert-core 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30d3e6c2241ca3fb2d35ead568fb24dc04db2d38a8faebb99eda33b0da7a354
-  data.tar.gz: f5d6ecdbcecbceabdf95ee474253b6e4ed0fc5cc5c52d25a7408d53ab54ccff0
+  metadata.gz: e1248f2c7c2721ea6135b6adb3a5d40afc95497c63d91e8b1b508febb6e7d4b1
+  data.tar.gz: 9e7f64e254dc25e1bf9894559c7586eb6fb96f3aea07bedd09d71a17d930e0fc
 SHA512:
-  metadata.gz: b7a9a026022ba96e5140d3aa6976bdbc8448dffdc8539b946df41016daf5847bf2c75a1458c2b8184d73e2a50a40741be67e8c382b49b1c1df5adf9e7c2e29dd
-  data.tar.gz: 42d7d7249ba0047709013c61a14c3428728967ff701b738eaa261683dfdf44ea899a3235cf1a2adb034034bb0bd006d7ec6ce59c415abfaef263647d15cbeb21
+  metadata.gz: a940b5ea3029c9cbc7b10034e3e6eca05370d4015a4c98af28a1eb8b2a825133627f1d25da20e8986d89f52da00c7056893eb9946aff5a017979bc720d097755
+  data.tar.gz: 37a51398a51fec8cac11b2b3aae8353f5483bfbd7e9485d1b644b8000dea5186036438f1a01b9f4c0d4ce8b940ab6b40261673eb309a663c6f61df45afcf1b45

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.19.0 (2021-02-07)
+
+* Simplify `Configuration`
+
 ## 0.18.0 (2021-02-07)
 
 * Add `Rewriter.execute`

data/lib/synvert/core/configuration.rb

@@ -1,26 +1,18 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 module Synvert::Core
   # Synvert global configuration.
-  class Configuration < Hash
-    include Singleton
+  class Configuration
+    class << self
+      attr_writer :path, :skip_files
 
-    # Set the configuration.
-    #
-    # @param key [String] configuration key.
-    # @param value [Object] configuration value.
-    def set(key, value)
-      self[key] = value
-    end
+      def path
+        @path || '.'
+      end
 
-    # Get the configuration.
-    #
-    # @param key [String] configuration key.
-    # @return [Object] configuration value.
-    def get(key)
-      self[key]
+      def skip_files
+        @skip_files || []
+      end
     end
   end
 end

data/lib/synvert/core/rewriter.rb

@@ -233,7 +233,7 @@ module Synvert::Core
     def add_file(filename, content)
       return if @sandbox
 
-      filepath = File.join(Configuration.instance.get(:path), filename)
+      filepath = File.join(Configuration.path, filename)
       if File.exist?(filepath)
         puts "File #{filepath} already exists."
         return
@@ -251,7 +251,7 @@ module Synvert::Core
     def remove_file(filename)
       return if @sandbox
 
-      file_path = File.join(Configuration.instance.get(:path), filename)
+      file_path = File.join(Configuration.path, filename)
       File.delete(file_path) if File.exist?(file_path)
     end
 

data/lib/synvert/core/rewriter/gem_spec.rb

@@ -26,7 +26,7 @@ module Synvert::Core
     # @return [Boolean] true if matches, otherwise false.
     # @raise [Synvert::Core::GemfileLockNotFound] raise if Gemfile.lock does not exist.
     def match?
-      gemfile_lock_path = File.join(Configuration.instance.get(:path), 'Gemfile.lock')
+      gemfile_lock_path = File.join(Configuration.path, 'Gemfile.lock')
 
       # if Gemfile.lock does not exist, just ignore this check
       return true unless File.exist?(gemfile_lock_path)

data/lib/synvert/core/rewriter/instance.rb

@@ -86,11 +86,11 @@ module Synvert::Core
     # It finds all files, for each file, it executes the block code, gets all rewrite actions,
     # and rewrite source code back to original file.
     def process
-      file_pattern = File.join(Configuration.instance.get(:path), @file_pattern)
+      file_pattern = File.join(Configuration.path, @file_pattern)
       Dir
         .glob(file_pattern)
         .each do |file_path|
-          next if Configuration.instance.get(:skip_files).include? file_path
+          next if Configuration.skip_files.include? file_path
 
           begin
             conflict_actions = []

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

data/spec/spec_helper.rb

@@ -18,9 +18,4 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
-
-  config.before do
-    Synvert::Core::Configuration.instance.set :path, '.'
-    Synvert::Core::Configuration.instance.set :skip_files, []
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Richard Huang
@@ -167,7 +167,6 @@ files:
 - lib/synvert/core/version.rb
 - spec/spec_helper.rb
 - spec/support/parser_helper.rb
-- spec/synvert/core/configuration_spec.rb
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb
@@ -216,7 +215,6 @@ summary: convert ruby code to better syntax.
 test_files:
 - spec/spec_helper.rb
 - spec/support/parser_helper.rb
-- spec/synvert/core/configuration_spec.rb
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb

data/spec/synvert/core/configuration_spec.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-module Synvert::Core
-  describe Configuration do
-    it 'sets / gets' do
-      Configuration.instance.set :key, 'value'
-      expect(Configuration.instance.get(:key)).to eq 'value'
-    end
-  end
-end