rails-credentials-git 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b2479563d72cb114d6ea43f74958299bb0d5023038029262cea512a744b817
-  data.tar.gz: fc6143fa7728060d423a354ab5361801a247870b25b1f676ffa8afa8060b9ef1
+  metadata.gz: 2745a47b6cb5e3f79f47c495fb82e1a768635c85955dd6bb9d303e5e8df5a906
+  data.tar.gz: 874beed8043efa141cc8f1587812c6c7b3c8fe2faf70c46e6f7b3ebb59245c40
 SHA512:
-  metadata.gz: d006ed3409435eee157e339f0c4aa508a77a790f71198e30a85675c46908ab83d5f6940e0719e126988a1212053c09bd629fe71ccaa5efff0462b7dea9a52c64
-  data.tar.gz: 7ba38be97d6a1b84dcc1dc29c7627f185617264f289c5cfef972c422bd4092d2918ab9e98f2532fd1518df8176fdfed094aab1175167cea0d9aa876c5bc79d18
+  metadata.gz: fbcec101574290dd577f0b74532b65ec9cf61b5e18253ae229eed74320543dae480774af2577b6d41f03e566eef711661a9bc5818a61a46eb0546326e5a93ed2
+  data.tar.gz: 76c44df99a4d80ab7cfa6a29048a9f70363c5da19657a736775bf527677586394597157e8c641a5d952c1d3905b672613c9d2b833729a6edb13a729a3e632196

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
+

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 cache: bundler
+dist: bionic
 env:
   - "RAILS_VERSION=5.2.0"
   - "RAILS_VERSION=6.0.0"
@@ -9,5 +10,7 @@ rvm:
   - 3.0.2
 before_install:
   - gem update bundler
-matrix:
-  fast_finish: true
+jobs:
+  exclude:
+  - rvm: 3.0.2
+    env: "RAILS_VERSION=5.2.0"

data/README.md

@@ -61,7 +61,7 @@ bin/enc --conflict # with RAILS_MASTER_KEY set if you need to
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `rake test` to run the tests.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "rails-credentials-git"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/lib/rails-credentials-git/cli.rb

@@ -10,7 +10,7 @@ module RailsCredentialsGit
 
     desc "install", "Copy binary into project's folder"
     def install
-      copy_file "bin/enc", "bin/enc", mode: :preserve
+      copy_file "lib/rails-credentials-git/templates/enc", "bin/enc", mode: :preserve
 
       method = RailsCredentialsGit.decrypt_method.sub("self.", "")
       insert_into_file "bin/enc", "\n#{method}" , after: %{require "openssl"\n}

data/lib/rails-credentials-git/templates/enc

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "optparse"
+require "base64"
+require "openssl"
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: enc [options] <encryped_file>"
+
+  opts.on('-k', '--key-path', 'Path to master key') do |path|
+    options[:key_path] = path
+  end
+
+  opts.on("--conflict") do
+    options[:conflict] = true
+  end
+
+  opts.on("--compare=BRANCH") do |branch|
+    options[:compare] = branch
+  end
+end.parse!
+
+key = ENV["RAILS_MASTER_KEY"]
+
+unless key
+  path = options[:key_path] || File.expand_path("../config/master.key", __dir__)
+  key = File.read(path).strip
+end
+
+if options.empty?
+  content_file = ARGV.empty? ? File.expand_path("../config/credentials.yml.enc", __dir__) : ARGV[0]
+  content = File.read(content_file)
+  puts decrypt(content, key)
+else
+  require "open3"
+
+  stdout, _, _ = if (target = options[:compare])
+    Open3.capture3("git diff --color #{target}:config/credentials.yml.enc HEAD:config/credentials.yml.enc")
+  else
+    target = File.exist?(File.expand_path("../.git/REBASE_HEAD", __dir__)) ? "REBASE_HEAD" : "MERGE_HEAD"
+    Open3.capture3("git diff --color HEAD:config/credentials.yml.enc #{target}:config/credentials.yml.enc")
+  end
+
+  stdout = "Nothing changed" if stdout.empty?
+  puts stdout
+end

data/lib/rails-credentials-git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsCredentialsGit
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/rails-credentials-git.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|bin)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test)/}) }
   end
   spec.bindir        = "bin"
   spec.executables   = ["rails_credentials_git"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-credentials-git
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ccocchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,13 +104,14 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - bin/rails_credentials_git
 - lib/rails-credentials-git.rb
 - lib/rails-credentials-git/cli.rb
+- lib/rails-credentials-git/templates/enc
 - lib/rails-credentials-git/version.rb
 - rails-credentials-git.gemspec
 homepage: https://github.com/ccocchi/rails-credentials-git

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rails-credentials-git (0.1.0)
-      thor (> 0.19, < 2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.9)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.6)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  universal-darwin-19
-
-DEPENDENCIES
-  activesupport (~> 5.2.0)
-  bundler (~> 2.2.5)
-  minitest (~> 5.0)
-  rails-credentials-git!
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.2.5