meroku 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d969ad79fb909f97bf0b4697ce29411b584fbc
-  data.tar.gz: 95ec9d65fb8ac7c4d33441e049d6a108036d71af
+  metadata.gz: 644b170886bbccc668dcbd9f7c85e12fd7f3fdd7
+  data.tar.gz: f2f9a6ceac6218ca01981f77999f3493976bb20e
 SHA512:
-  metadata.gz: 76648bfeacbc3ad173c1d129f9cdff075bae6c66c8d4ab2c5a8e85fa1de9a6197aa19148681e5e150985ff8675c0d3aa7d761ec3f4a82241262c993890373038
-  data.tar.gz: 1a374f067804e197d9601a9de0b8580e94e0dee45ff7ff977dc848becc9349ecd921f54554c55145c62a5bdfaf725bdb55823d69acfd6b309fccc9a0acbb0c2b
+  metadata.gz: d4a8a319a22ac72f047737ac20a66ab94b8e42a83a4542e6b3017dbb253e51bf8a9dfafc75888796a9d400d7733ca126a6a68949dad12c029486406851677721
+  data.tar.gz: 34497e672d4a3d8f5a271610ebaaee77549bb6295aa0e8bc1394b148bf80998f86e29fbb8fda5ff61b268d5985abf32db36f01acbae8d23aec60685a76beb099

data/README.md

@@ -75,30 +75,10 @@ And deploy
 
 The meroku secret is a 12 charactor hex string, eg.  'dcb528615aa4'
 All other secrets are derived/downloaded from it.
+To do administrative commands such as spawn, despawn, you would need to
+do this first,
 
-After loggin in via the CLI, these two files are populated
-  ~/.meroku/.apiusername
-  ~/.meroku/.apisecret
-
-  Frontend (rails app)
-
-  CI
-    CLI
-      run_instances()
-        requires
-          ENV['AWS_ACCESS_KEY']
-    	  ENV['AWS_SECRET']    
-
-  Developer workstation
-    CLI
-      run_instances()
-        requires
-          ENV['AWS_ACCESS_KEY']
-    	  ENV['AWS_SECRET']
-             
-
-
-OLD: You will need a copy of the file `.secret`. Place it at `~/.meroku/.secret`
+    export SECRET="example"
 
 
 ### Commands

data/lib/meroku/cli/secrets.rb

@@ -5,7 +5,9 @@ module Meroku
       def self.load(admin: false)
         return unless admin
         env_file = Dir.home + '/.meroku/meroku.env'
+        pem_file = Dir.home + '/.meroku/meroku.id_rsa'
         attempt_download unless File.exist?(env_file)
+        attempt_download unless File.exist?(pem_file)
         Dotenv.load(env_file)
       end
 
@@ -14,6 +16,7 @@ module Meroku
         FileUtils.mkdir_p "#{Dir.home}/.meroku"
         `curl -so ~/.meroku/meroku.env https://s3.amazonaws.com/#{ENV['SECRET']}/meroku.env`
         `curl -so ~/.meroku/meroku.id_rsa https://s3.amazonaws.com/#{ENV['SECRET']}/meroku.id_rsa`
+        FileUtils.chmod 0400, "#{Dir.home}/.meroku/meroku.id_rsa"
       end
     end
   end

data/lib/meroku/tunnelable.rb

@@ -6,13 +6,13 @@ module Meroku
       retries = 0
       begin
         code = nil
-        puts "DB8 tunnel_ip #{@tunnel_ip}"
-        puts "DB8 @tunnel_username #{@tunnel_username}"
-        puts "DB8 @tunnel_key_name #{@tunnel_key_name}"
-        puts "DB8 #{`ls -la ~/.meroku/`}"
+        #puts "DB8 tunnel_ip #{@tunnel_ip}"
+        #puts "DB8 @tunnel_username #{@tunnel_username}"
+        #puts "DB8 @tunnel_key_name #{@tunnel_key_name}"
+        #puts "DB8 #{`ls -la ~/.meroku/`}"
         Net::SSH.start(@tunnel_ip,
                        @tunnel_username,
-                       keys: @tunnel_key_name,
+                       keys: [ @tunnel_key_name ],
                        verify_host_key: false) do |ssh|
           ssh.open_channel do |channel|
             puts cmd

data/lib/meroku/version.rb

@@ -1,3 +1,3 @@
 module Meroku
-  VERSION = "2.0.21"
+  VERSION = "2.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meroku
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - Sam Weerasinghe