From 7ac70ef5cc9f255e25aef89af08bc44d8306dbdb Mon Sep 17 00:00:00 2001 From: Leonid Medovyy Date: Fri, 31 Aug 2018 14:07:51 -0700 Subject: [PATCH 1/2] locked hashie to 3.5.7 --- .byebug_history | 8 ++++ .gitignore | 3 ++ .idea/dc_ui.iml | 80 ++++++++++++++++---------------- Gemfile.lock | 120 ++++++++++++++++++++++++------------------------ dc_ui.gemspec | 2 +- 5 files changed, 111 insertions(+), 102 deletions(-) diff --git a/.byebug_history b/.byebug_history index 1b83817..cce58fa 100644 --- a/.byebug_history +++ b/.byebug_history @@ -1,3 +1,11 @@ +exit +exti +c +exit +Hashie::Mash.load(configuration.ui_file.to_s) +Hashie::Mash.load(configuration.ui_file) +configuration.ui_file +configuration c helper c diff --git a/.gitignore b/.gitignore index 4614602..889ee0a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ # rspec failure tracking .rspec_status + +# redis +dump.rdb diff --git a/.idea/dc_ui.iml b/.idea/dc_ui.iml index 0d1fad2..04f3847 100644 --- a/.idea/dc_ui.iml +++ b/.idea/dc_ui.iml @@ -7,65 +7,63 @@ - - - - - - - - - - + + + + + + + + + + + - - + + - + - - + + - - + + - + + - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - - + - + - - + + - - + + \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 4699885..8d52985 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,49 +2,49 @@ PATH remote: . specs: dc_ui (2.5.5) - hashie + hashie (~> 3.5.7) rails (~> 5.2.0) GEM remote: https://rubygems.org/ specs: - actioncable (5.2.0) - actionpack (= 5.2.0) + actioncable (5.2.1) + actionpack (= 5.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.0) - actionview (= 5.2.0) - activesupport (= 5.2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.0) - activesupport (= 5.2.0) + actionview (5.2.1) + activesupport (= 5.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0) - activesupport (= 5.2.0) + activejob (5.2.1) + activesupport (= 5.2.1) globalid (>= 0.3.6) - activemodel (5.2.0) - activesupport (= 5.2.0) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) arel (>= 9.0) - activestorage (5.2.0) - actionpack (= 5.2.0) - activerecord (= 5.2.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) marcel (~> 0.3.1) - activesupport (5.2.0) + activesupport (5.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -60,12 +60,12 @@ GEM concurrent-ruby (1.0.5) crass (1.0.4) diff-lcs (1.3) - docile (1.3.0) + docile (1.3.1) erubi (1.7.1) globalid (0.4.1) activesupport (>= 4.2.0) hashie (3.5.7) - i18n (1.0.1) + i18n (1.1.0) concurrent-ruby (~> 1.0) json (2.1.0) loofah (2.2.2) @@ -77,59 +77,59 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.0) mimemagic (0.3.2) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) nio4r (2.3.1) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) - powerpack (0.1.1) + powerpack (0.1.2) rack (2.0.5) - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.0) - actioncable (= 5.2.0) - actionmailer (= 5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) - activemodel (= 5.2.0) - activerecord (= 5.2.0) - activestorage (= 5.2.0) - activesupport (= 5.2.0) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) bundler (>= 1.3.0) - railties (= 5.2.0) + railties (= 5.2.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.0) - actionpack (= 5.2.0) - activesupport (= 5.2.0) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (2.2.2) rake rake (10.5.0) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -137,13 +137,13 @@ GEM rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -154,7 +154,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) url (0.3.2) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) @@ -173,4 +173,4 @@ DEPENDENCIES rubocop (~> 0.50.0) BUNDLED WITH - 1.16.1 + 1.16.4 diff --git a/dc_ui.gemspec b/dc_ui.gemspec index be78840..f4a6adb 100644 --- a/dc_ui.gemspec +++ b/dc_ui.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'hashie' + spec.add_dependency 'hashie', '~> 3.5.7' spec.add_dependency 'rails', '~> 5.2.0' spec.add_development_dependency 'bundler', '~> 1.16.a' From 098aa00060402937433904dd5797e8d4e0f16be1 Mon Sep 17 00:00:00 2001 From: Leonid Medovyy Date: Fri, 31 Aug 2018 14:10:08 -0700 Subject: [PATCH 2/2] removed ignored files --- .idea/dc_ui.iml | 69 ----------------------------------------------- .idea/misc.xml | 4 --- .idea/modules.xml | 8 ------ 3 files changed, 81 deletions(-) delete mode 100644 .idea/dc_ui.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml diff --git a/.idea/dc_ui.iml b/.idea/dc_ui.iml deleted file mode 100644 index 04f3847..0000000 --- a/.idea/dc_ui.iml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9d57d9d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index c63fc17..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file