mrf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460fc138bcf01da0838c3e4578c8d04220e873a9
-  data.tar.gz: 8f59a3edb231605865b089392b82dde73a27aaf7
+  metadata.gz: cd0828720854c113d3aeb5d0dbe97c0261bfd5ee
+  data.tar.gz: 790fa84aad37e2f8be4307b798d3b75ffd7649df
 SHA512:
-  metadata.gz: 9861a9fb6f48dfaa070185e991d9b9f1346d27659e513e987ea28731f43a5c989d2dcff2d2a78fd5a39e432fb90c7adaa8b978663ef0133e1e62964802de8425
-  data.tar.gz: 4fd1947c6f210ba63689ad5cbbd7c01dc43c8d04b0612d127f3649dd156249a9198621980963fba7d2458d2efa7d2dba7241bcec98187c839197f5317e2ea8fc
+  metadata.gz: a49a20505b262fa0f9178e8c310a0d080a7ad674b26040420f25b35163ecb3af7c20bef8a9e7e7caa943631bd5e73ea4529c9221ed6a554d0f4bc16b254ad1ed
+  data.tar.gz: dba7e06f7a59b8b9438d78da02beb9230761222ccccd61e2d3568a2469ef9e79f8c0b4a71fbc33b0c123718303048c3e6966f0596639f077b892cb00c6bd3ab4

data/Gemfile.lock

@@ -1,29 +1,26 @@
 PATH
   remote: .
   specs:
-    mrf (0.0.2)
+    mrf (0.0.4)
       capistrano
       gpgme
 
 GEM
   remote: https://rubygems.org/
   specs:
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
+    capistrano (3.2.1)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    colorize (0.7.3)
     diff-lcs (1.2.4)
-    gpgme (2.0.2)
-    highline (1.6.19)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    net-ssh-gateway (1.2.0)
+    gpgme (2.0.6)
+      mini_portile (>= 0.5.0, <= 0.6.0)
+    i18n (0.6.11)
+    mini_portile (0.6.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
     rake (10.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -33,6 +30,10 @@ GEM
     rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
+    sshkit (1.5.1)
+      colorize
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,19 +4,19 @@
 
 A libary for uploading gpg secrets with capistrano.
 
-put your secrets in a gpg encrypted file.
-In rails the default is `config/secrets.{{Rails.env}}.yml.gpg`
+put your secrets in a gpg encrypted file. Ex: `config/secrets.{{Rails.env}}.yml.gpg`
 
 Then add mrf to you deploy script like this
 
 ```ruby
 require 'mrf/capistrano'
-
+set :mrf_secrets_path, "myproject/config/secrets.#{rails env maybe?}.yml.gpg"
+set :mrf_remote_config_dir, "myrelease/config"
 after "deploy", "mrf:upload_secrets"
 ```
 
-This will upload the files listed in secrets to the same folder as your secrets
-file but on the server.
+It will ask you for your gpg passphrase while deploying.
+And upload the files listed in secrets to your server (file mode 0600 by default)
 
 ## A Example secrets file
 
@@ -32,18 +32,43 @@ other_service.yml:
   production:
     password: 115024d2-7c74-326e-c9ec-064f42d08b31
 	username: 1e27a053-60a4-af61-f38d-9f1f123740d6
-```
 
-## Configuration
+non_yaml_suff.key: |
+  -----BEGIN PGP PRIVATE KEY BLOCK-----
+  Version: GnuPG v1.4.14 (Darwin)
 
-The above example is the default behavior but you can configure it with `MrF::Project.configure`
-
-```ruby
-MrF::Project.configure do |project|
-  project.project_root = Rails.root
-  project.gpg_passphrase = '1234' # default is to ask you for it with the console
-  project.env = 'sandbox' # default is to use MRF_ENV or RAILS_ENV
-end
+  lQH+BFI4SpEBBAC7culGRvKFA6mob902i8u4irg1jYP4WtJDtNMoMbCjhLrjE3kg
+  Z8I9f0xpaBFZ2kHuD5Om7XH1w1OQ9G5EFiDBReCToe+xz7GLtFuJ/lDwLYLVHJiZ
+  yPQKOv64kZ8F+063dr8j2NryBhKiJvcTIF2l0LWsI4OkfboLATVOUu1TqwARAQAB
+  /gMDAremiA+pJjFcYPk8Ox0ynig50LCn1QuTja77+/ZjGoYsO9e7l11/6YcAGSb6
+  e6zKkQqiSXUOLS912pRQk976Xl0mXLzQCLEufkdooh9SrQjfRoZVulwIjtrJj/CC
+  r4iCSFyilrZOeSNIVGMXjkvSykHkiKc8XJiC3iXvaZa9nxJZOfvCVOW80NaNwDEv
+  h7a1va+vlQAtlkiplXt/n2Y+4TfY2PjZnBC2hXn7FRxj45upOxuTo1B4RSEiN+8q
+  IP3jbBSeq11Z7KMJXH/mEKRdjdxSFql9gnhX3XvWMifTULbw5ynur8ZKc8J99kGU
+  /NYEo197z5KjvG5iBlHgiv7tGQOcpETaN635X2er95itKwdOhda0chJY2u4TybSn
+  ali2e6GVk0qFmv5Q74I/j/YqzCX02K1LOkVsWvFS+7LE/tZejtovFSv8bTnXrxTa
+  Q4lEjfIKPXH1Ckw08mLx2FtpQYbSdIrGLZxPmfMsKXH2tC1Ub2JpYXMgRnVua2Ug
+  KE1yIEYpIDx0b2JpYXNAYmx1ZW1hbmdyb3VwLm9yZz6IuAQTAQIAIgUCUjhKkQIb
+  AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQcYQDPAkatwFLswP7BIViV0+9
+  6EvKVULGRtHPO2vZil7AR+WL8BEk22bGlFmGjRxBYmfs4TTmzJPO+KSplSgsAz/h
+  eXlyKYlHL3CgM01GUi00gqpqZ+ppMhvgs5l5gYmTo9s2iuIuNi1EFyNLf+ocwMgB
+  tEQm2yzjhRqSOq4aTIbj+vG7sYGRNyREsZadAf0EUjhKkQEEAL+8DiuGPFj+gpmL
+  qeJ13M9Kh9HG+dIK3vfWw4bW49UFB4xr2hugBuMqh5vlGvJvpqei3MZNiEWegHD0
+  5dr7e/KA6qX0PlTgl4hovhU2G/2DKn3wXAmBFj8Y98y1GCiPG3e6+PeZkzveTmNb
+  yWKFLunJSgbouvEpRREU3JabN7d1ABEBAAH+AwMCt6aID6kmMVxgiqLxlLOL1l53
+  erOOeSIUMkGG9odtsVNCk/Ot/5nhMGbolZ5tZlCoatwC3T3ZBSbKG6pElTb53sXn
+  ORGRUPD/bUxDHLe+6jF8BuW0l/SkpBQ2265MTyF9EQE59JVibm+75nHhA8DZzUaz
+  fkKNXcEqQaB2oiBVD+BH5Io51aUFtZTcahSUtK+2GK1IKiSfRA/kF8ZkbjXMURcY
+  qil68hGVR6CNXgoCtbDK5TFueGiGu+p9lsrMexmvp+zxPtpQN+ewaWsIajfpcXPg
+  evl/Vw/5v/IPMJPMG3qiqZTEPaf/NWdO+wkCd1Q0CsIMiYQbBQmXgh7YOxK5y62q
+  J7biPD+G2txFWT1xlDjW9FTIiTp0vOvpD4YQ/ehxyhWgMmDHoSb6ed5pLpAiLkgb
+  /1TNVkdeigkRdO/2nu92uLMENJP2QSGKEH0cX5ao8jmiRz84T69pgOH9nyQeyy1C
+  pSpEQlhITl0m/YifBBgBAgAJBQJSOEqRAhsMAAoJEHGEAzwJGrcBerkD/R5RkyKi
+  8K4p+zX4dSYP/i9PhLZeVP0tjCYj48eTJg17fnyFbeK6VwZ30bMK7VYBJzPCCeza
+  5xTiZlBAC/BByRZiSGWTEiec6U4y6GSpkdi8fWrWp8KkFhHm9yviJk0Up8g9QLo3
+  a1W2egzD5CeUVPSYxEIj7FgEMA39UxYwVABv
+  =NGkh
+  -----END PGP PRIVATE KEY BLOCK-----
 ```
 
 ## Running the specs

data/lib/mrf/keyring.rb

@@ -43,22 +43,24 @@ module MrF
         io = IO.for_fd(fd, 'w')
         io.puts(password)
         io.flush
-        return
-      end
-
-      # Prompt user
-      begin
-        console = IO.console
-        console.write("Passphrase for #{uid_hint}: ")
-        console.noecho do |noecho|
+      else
+        # Prompt user
+        begin
           io = IO.for_fd(fd, 'w')
-          io.puts(noecho.gets)
-          io.flush
+
+          console = IO.console
+          console.write("Passphrase for #{uid_hint}: ")
+          console.noecho do |noecho|
+            io.puts(noecho.gets)
+            io.flush
+          end
+          console.puts
+        ensure
+          (0 ... $_.length).each do |i| $_[i] = ?0 end if $_
         end
-        console.puts
-      ensure
-        (0 ... $_.length).each do |i| $_[i] = ?0 end if $_
       end
+
+      $stderr.puts
     end
 
     def crypto

data/lib/mrf/version.rb

@@ -1,3 +1,3 @@
 module MrF
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/mrf/keyring_spec.rb

@@ -13,13 +13,15 @@ module MrF
       expect(keyring.data).to eq('production' => { 'secret' => 'hello' })
     end
 
-    it "can retrive passphrase from console if no passphrase is given" do
+    it "can retrieve passphrase from console if no passphrase is given" do
+      io = double("IO")
       console = double("IO::Console")
       expect(console).to receive(:write).with(
         "Passphrase for EEF971D578000737 Tobias Funke (Mr F) <tobias@bluemangroup.org>: "
       )
       expect(console).to receive(:noecho).and_yield(double("FD", gets: "1234"))
-      expect(console).to receive(:puts)
+      expect(io).to receive(:puts)
+      expect(IO).to receive("for_fd").and_return(io)
       expect(IO).to receive("console").and_return(console)
 
       keyring = Keyring.new(path: fixture_path('app.yml.gpg'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Patrik Kårlin
@@ -10,76 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails Application Secrets With GPG
@@ -89,7 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails Application Secrets With GPG
@@ -142,3 +142,4 @@ test_files:
 - spec/mrf/keyring_spec.rb
 - spec/mrf/project_spec.rb
 - spec/spec_helper.rb
+has_rdoc: