ey_secrets 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2JjNjMyZGE5NjUxZDYwNGU1YTkzNmIxYmZjMjE1ZjMzMWY1N2YyNg==
-  data.tar.gz: !binary |-
-    ZWI0YWIyNjc5OTg0NzViMDVhMGViZDk0MTM0N2NhNTFiNTg2YTY3ZA==
+SHA1:
+  metadata.gz: 021cde289ba89d3c0de9cda34f67ceb7a60aa184
+  data.tar.gz: 43b14d1814258a1889c7916a3f9a9d9c0927f442
 SHA512:
-  metadata.gz: !binary |-
-    ZGFlMjgxOGY1ZjQwNWQwNGU2NTQ1MDY2NzIyOWNiOTI3YzJhY2YyOGMxZmEx
-    Njc0MTEyYzg2NGQ1NzQ4ZGY5OWM0NzBmMjgyMThjMjZmOTg5OWJlNmJlNjQ1
-    N2ZjYmE2ODlkNWU2ZjFlOTNkMWZmNDRmNjdiZDUyNzBkMDY3ZTA=
-  data.tar.gz: !binary |-
-    Yzg1NTRlODc0MTJmYjdjYmVlOTg1ZmJiYjYyMDg1ZmMyMjliMmJjMmM5MTQx
-    MDU0NGUwYmU5YjQzMTE5ZTRlMWQ1YjU3NzE2MDE3NDJiNjQ5MmNlNzYyMzJm
-    ZjMxMmQxMWZmYzkyZDRmMDVmYzk1ZDkyYzYyZTU2NmQ5ZTNhOWQ=
+  metadata.gz: 364b3da59878494e1ed88c8c7625d014f8d1250431d434aafb1e4719161400c91b66ed83028dddde4ab9b3127b05eae5e68191b4655b41feca39866c1d60e831
+  data.tar.gz: 94cdd39ef98f15a0b85170d1c73be900297f0244099822badb55b8343134c46d88f7278028306e4301ccaefd4c0e246b67068223b6a46c7e2f24d0fbfd43e3b1

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 2.1
+
+before_install:
+  - gem install bundler
+
+script:
+  - "bundle exec rspec"

data/README.md

@@ -1,5 +1,8 @@
 # Engine Yard Secrets
 
+[![Gem Version](https://badge.fury.io/rb/ey_secrets.svg)](http://badge.fury.io/rb/ey_secrets)
+[![Build Status](https://travis-ci.org/tf/ey_secrets.svg?branch=master)](https://travis-ci.org/tf/ey_secrets)
+
 Manage sensible configuration files accross Engine Yard instances.
 
 ## Installation

data/lib/ey_secrets/actions/copy_files.rb

@@ -20,7 +20,7 @@ module EySecrets
     end
 
     def env_files
-      repository.glob("#{instance.environment.name}/*.env")
+      repository.glob("#{instance.environment.name}/*")
     end
   end
 end

data/lib/ey_secrets/adapters/engine_yard.rb

@@ -20,7 +20,9 @@ module EySecrets
     end
 
     def environments_from(ey_app)
-      ey_app.app_environments.map do |ey_app_environment|
+      ey_app_environments = ey_app.app_environments || []
+
+      ey_app_environments.map do |ey_app_environment|
         environment_from(ey_app, ey_app_environment.environment)
       end
     end

data/lib/ey_secrets/version.rb

@@ -1,3 +1,3 @@
 module EySecrets
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'.freeze
 end

data/spec/features/update_spec.rb

@@ -14,7 +14,11 @@ module EySecrets
 
     def repository(options = {})
       Repository.new(['git@git.exmaple.com:my_app_config.git'],
-                     ['production/secrets.env', 'staging/secrets.env'],
+                     [
+                       'production/secrets.env', 'staging/secrets.env',
+                       'production/secrets.yml', 'staging/secrets.yml',
+                       'production/secrets.json', 'staging/secrets.json',
+                     ],
                      options.fetch(:ready_for_update, true))
     end
 
@@ -26,12 +30,14 @@ module EySecrets
       }.to raise_error(Repository::NotReadyForUpdate)
     end
 
-    it 'copies .env files from environment directory to instances' do
+    it 'copies files from environment directory to instances' do
       options = {app: 'my_app', environment: 'production'}
 
       commands = Update.new(applications, repository, options).commands
 
       expect(commands).to include('scp production/secrets.env user@host:/data/my_app/shared/config/secrets.env')
+      expect(commands).to include('scp production/secrets.yml user@host:/data/my_app/shared/config/secrets.yml')
+      expect(commands).to include('scp production/secrets.json user@host:/data/my_app/shared/config/secrets.json')
     end
 
     it 'restarts monit' do

data/spec/integration/ey_secrets/git_spec.rb

@@ -10,7 +10,7 @@ module EySecrets
         it 'returns repository uris' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
 
             remotes = Git.repository('repo').remotes
 
@@ -23,7 +23,7 @@ module EySecrets
         it 'returns paths relative to CWD' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file', 'some/file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
 
             files = Git.repository('repo').files
 
@@ -34,7 +34,7 @@ module EySecrets
         it 'removes leading dot' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
 
             files = Dir.chdir('repo') do
               Git.repository('.').files
@@ -49,7 +49,7 @@ module EySecrets
         it 'is true after clone' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
 
             repository = Git.repository('repo')
 
@@ -60,7 +60,7 @@ module EySecrets
         it 'is false if repo has untracked files' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
             `touch repo/other`
 
             repository = Git.repository('repo')
@@ -72,7 +72,7 @@ module EySecrets
         it 'is false if repo has modified files' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
             `echo "change" > repo/file`
 
             repository = Git.repository('repo')
@@ -84,7 +84,7 @@ module EySecrets
         it 'is false if repo has unpushed commits' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
             `(cd repo; echo "change" > file; git add .; git commit -m "change")`
 
             repository = Git.repository('repo')
@@ -96,7 +96,7 @@ module EySecrets
         it 'is true if all commits have been pushed' do
           in_sandbox do
             create_bare_repo('origin_repo', ['file'])
-            `git clone origin_repo repo`
+            clone_repo('origin_repo', 'repo')
             `(cd repo; echo "change" > file; git add .; git commit -m "change"; git push origin master 2> /dev/null)`
 
             repository = Git.repository('repo')
@@ -106,17 +106,29 @@ module EySecrets
         end
       end
 
+
+      def clone_repo(from, to)
+        `git clone #{from} #{to} 2> /dev/null`
+        Dir.chdir(to) { configure_git_user }
+      end
+
       def create_bare_repo(name, files = {})
         mkdir('original_repo')
         Dir.chdir('original_repo') do
           `git init`
+          configure_git_user
           files.each do |file|
             mkdir_p(File.dirname(file))
             touch(file)
           end
           `git add .; git commit -m "initial commit"`
         end
-        `git clone --bare original_repo #{name}`
+        `git clone --bare original_repo #{name} 2> /dev/null`
+      end
+
+      def configure_git_user
+        `git config user.email spec@example.com`
+        `git config user.name "EySecrets Spec"`
       end
 
       def in_sandbox(&block)

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ey_secrets
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   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: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !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: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -102,7 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manage sensible configuration files accross Engine Yard instances.