env_compare 0.1.3.pre.beta → 0.1.4.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51a067d2f76fb50f8d90005c51ff3a538d4d426087f9a36da38321050736b32
-  data.tar.gz: 370af34407e7666e1484d405d8a36bb31daf2c925d9a690caa7099184ade4ec8
+  metadata.gz: d4b3d3f36b43327e20252ce4cd37aa306d25de324d0ea234f0003f89910a8f4a
+  data.tar.gz: 4598c0fa7b5f40783d5d11c4511535e2cc771527eaa28a24c1b030d6dd13d6e9
 SHA512:
-  metadata.gz: 1d78e742eb5556f34b52d19d15c34f8d653a3bd7d65586b4cc24d88607cdbc1c24b2b28a63b5b45b25ad3a1a8e868559ea162e7abd57591645f1828946c7e896
-  data.tar.gz: a57c5325cc82f97815170ba3f9e31cb9845efae58fc7115bdd8ba2e4c8ea1c978a73b2cb1c3fa8dd10034a73926a46389e3636c45ef2b277444b8c7daa087c61
+  metadata.gz: e645f7ac2ee563e461646372f8e24e44ea84b1c72a3e41982e516ffd700ce2a0eb5be08432f649bf91eba41e577f61f2ba55425732cfbf4f094decadb4594882
+  data.tar.gz: 007ce621b0bd9c3c9f86094fe070a0b19ca4c8d3bd9e839c756ddc8424ef2e1bc1a72098af6a1b3524c589bb28480f6ae19da51b97c6061c53f9725ef26565fd

data/.rubocop.yml

@@ -13,156 +13,20 @@
 require:
   - rubocop-performance
 
+AllCops:
+  NewCops: enable
+
 Layout/LineLength:
   Max: 120
 
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-
-Lint/BinaryOperatorWithIdenticalOperands:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/DuplicateElsifCondition:
-  Enabled: true
-
-Lint/DuplicateRescueException:
-  Enabled: true
-
-Lint/EmptyConditionalBody:
-  Enabled: true
-
-Lint/FloatComparison:
-  Enabled: true
-
-Lint/MissingSuper:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Lint/OutOfRangeRegexpRef:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/SelfAssignment:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Lint/TopLevelReturnWithArgument:
-  Enabled: true
-
-Lint/UnreachableLoop:
-  Enabled: true
-
-
 Metrics/MethodLength:
   Max: 15
 
-
-Performance/AncestorsInclude:
-  Enabled: true
-
-Performance/BigDecimalWithNumericArgument:
-  Enabled: true
-
-Performance/RedundantSortBlock:
-  Enabled: true
-
-Performance/RedundantStringChars:
-  Enabled: true
-
-Performance/ReverseFirst:
-  Enabled: true
-
-Performance/SortReverse:
-  Enabled: true
-
-Performance/Squeeze:
-  Enabled: true
-
-Performance/StringInclude:
-  Enabled: true
-
-
-Style/AccessorGrouping:
-  Enabled: true
-
-Style/ArrayCoercion:
-  Enabled: true
-
-Style/BisectedAttrAccessor:
-  Enabled: true
-
-Style/CaseLikeIf:
-  Enabled: true
-
 Style/Documentation:
   Enabled: false
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/ExplicitBlockArgument:
-  Enabled: true
-
-Style/GlobalStdStream:
-  Enabled: true
-
-Style/HashAsLastArrayItem:
-  Enabled: true
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/OptionalBooleanParameter:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Style/RedundantFetchBlock:
-  Enabled: true
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: true
-
-Style/RedundantFileExtensionInRequire:
-  Enabled: true
-
-Style/SingleArgumentDig:
-  Enabled: true
-
-Style/SlicingWithRange:
-  Enabled: true
-
-Style/StringConcatenation:
-  Enabled: true

data/CHANGELOG.md

@@ -1,16 +1,17 @@
 # CHANGELOG
 
-## [Unreleased]
-## [0.1.3.pre.beta]
+## main (unreleased)
+- WIP
+
+## 0.1.3.pre.beta (2020-09-02)
 - Added `force` and `no-force` options for updating environment variables.
 
-## [Released]
-### [0.1.3.pre.alpha] - 2020-07-29
+## 0.1.3.pre.alpha (2020-07-29)
 - Added Heroku Oauth.
 - Added ability to update/remove environment variables.
 
-### [0.1.1] - 2020-06-12
+## 0.1.1 (2020-06-12)
 - Improve description example on `diff` option.
 
-### [0.1.0] - 2020-06-12
+## 0.1.0 (2020-06-12)
 - Initial release. Includes a `diff` option & 2 themes.

data/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (12.3.3)
     rate_throttle_client (0.1.2)
@@ -55,7 +55,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.89.1)
+    rubocop (0.90.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
@@ -66,8 +66,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+    rubocop-performance (1.8.0)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
     thor (1.0.1)
     unicode-display_width (1.7.0)

data/README.md

@@ -96,8 +96,8 @@ applications. This includes the options:
 
 - `--key=` is required. The name of the Heroku environment variable you want to update.
 - `--value=` is optional. The value of the environment variable you want to update. If not provided, will unset the environment variable.
-- `--force` is a default option. Updates the environment variable, or adds it if not present.
-- `--no-force` is optional. Only update the environment variable if present in the application.
+- `--force` is a default option. Updates the environment variable, or adds it if not present. ** 0.1.3.pre.beta **
+- `--no-force` is optional. Only update the environment variable if present in the application. ** 0.1.3.pre.beta **
 
 ### Examples
 

data/bin/console

@@ -11,16 +11,8 @@ require 'env_compare'
 require 'pry'
 
 def reload!
-  puts 'Reloading ...'
-
-  root_dir = File.expand_path('..', __dir__)
-  reload_dirs = %w[lib]
-
-  reload_dirs.each do |dir|
-    Dir.glob("#{root_dir}/#{dir}/**/*.rb").each { |file| load(file) }
-  end
-
-  true
+  puts 'Reloading...'
+  exec 'bin/console'
 end
 
 Pry.start

data/lib/env_compare.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'env_compare/template'
 require 'env_compare/errors'
-require 'env_compare/name_space'
 require 'env_compare/version'
 require 'env_compare/cli'
 

data/lib/env_compare/cli.rb

@@ -31,12 +31,12 @@ module EnvCompare
 
       heroku_results(envs)
 
-      # https://stackoverflow.com/a/5462069/2892779
       html =
-        theme(options[:theme]).
-          result(
-            ::EnvCompare::NameSpace.new(data: calculated_output(envs), headers: ['KEY', envs].flatten).get_binding
-          )
+        ::EnvCompare::Template.new(
+          data: calculated_output(envs),
+          headers: ['KEY', envs].flatten,
+          theme_base_path: theme_base_path
+        ).render('dark.html.erb')
 
       save_and_open_file(html)
     end
@@ -105,17 +105,19 @@ module EnvCompare
     end
 
     def heroku
-      @heroku ||= PlatformAPI.connect_oauth(ENV['OAUTH_TOKEN'])
+      @heroku ||= PlatformAPI.connect_oauth(ENV.fetch('OAUTH_TOKEN'))
     end
 
-    def theme(file)
-      return ERB.new(File.read(theme_path(file))) if File.exist?(theme_path(file))
+    def theme_path(file)
+      path = File.join(theme_base_path, "#{file}.html.erb")
+
+      return path if File.exist?(path)
 
       raise MissingThemeError
     end
 
-    def theme_path(file)
-      @theme_path ||= File.join(File.dirname(__dir__), '..', 'themes', "#{file}.erb")
+    def theme_base_path
+      @theme_base_path ||= File.expand_path(File.join(File.dirname(__dir__), '..', 'themes'))
     end
 
     def config_var_update(app_name, env_hash)

data/lib/env_compare/template.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# https://stackoverflow.com/a/10241263/2892779
+module EnvCompare
+  class Template
+    def initialize(data:, headers:, theme_base_path:)
+      @data = data
+      @headers = headers
+      @theme_base_path = theme_base_path
+    end
+
+    def render(path)
+      content = File.read(File.join(@theme_base_path, path))
+      t = ERB.new(content)
+      t.result(binding)
+    end
+  end
+end

data/lib/env_compare/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnvCompare
-  VERSION = '0.1.3-beta'
+  VERSION = '0.1.4-alpha'
 end

data/themes/{dark.erb → dark.html.erb}

@@ -43,7 +43,6 @@
   </style>
   </head>
   <body>
-    <% table_template = EnvCompare::NameSpace.new(headers: headers, data: data) %>
-    <%= ERB.new(File.new("themes/table_template.erb").read).result(table_template.get_binding) %>
+    <%= render 'table_template.html.erb' %>
   </body>
 </html>

data/themes/{light.erb → light.html.erb}

@@ -42,7 +42,6 @@
   </style>
   </head>
   <body>
-    <% table_template = EnvCompare::NameSpace.new(headers: headers, data: data) %>
-    <%= ERB.new(File.new("themes/table_template.erb").read).result(table_template.get_binding) %>
+    <%= render 'table_template.html.erb' %>
   </body>
 </html>

data/themes/{table_template.erb → table_template.html.erb}

@@ -1,17 +1,17 @@
 <table>
   <thead>
     <tr>
-      <% headers.each_with_index do |header, idx| %>
+      <% @headers.each_with_index do |header, idx| %>
         <th>
           <%= header %>&nbsp;
-          (<%= data.map { |col| col[idx] }.compact.size %>)
+          (<%= @data.map { |col| col[idx] }.compact.size %>)
         </th>
       <% end %>
     </tr>
   </thead>
 
   <tbody>
-    <% data.each do |row| %>
+    <% @data.each do |row| %>
       <tr>
         <% row.each do |cell| %>
           <td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: env_compare
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre.beta
+  version: 0.1.4.pre.alpha
 platform: ruby
 authors:
 - Jay Dorsey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -133,11 +133,11 @@ files:
 - lib/env_compare.rb
 - lib/env_compare/cli.rb
 - lib/env_compare/errors.rb
-- lib/env_compare/name_space.rb
+- lib/env_compare/template.rb
 - lib/env_compare/version.rb
-- themes/dark.erb
-- themes/light.erb
-- themes/table_template.erb
+- themes/dark.html.erb
+- themes/light.html.erb
+- themes/table_template.html.erb
 homepage: https://jaydorsey.com/
 licenses: []
 metadata:

data/lib/env_compare/name_space.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module EnvCompare
-  class NameSpace
-    def initialize(hash)
-      hash.each do |key, value|
-        singleton_class.send(:define_method, key) { value }
-      end
-    end
-
-    def get_binding
-      binding
-    end
-  end
-end