meroku 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f904e491e3b5db4cac84dd8df856e3f261ed524
-  data.tar.gz: 50bc9918fee760e9023221be2ea2331fc4e3a515
+  metadata.gz: 83ad90672b1ba754f3a9d60a73014e33fae3f7a9
+  data.tar.gz: c2059ae0f7f906600851aeef0e9ea111005fe434
 SHA512:
-  metadata.gz: bd05e025fb8078879f8950ce154d9d2b5d775f5f76cb1cb53aba11c1a6006cf750d5d8b9220eb2390ddc3f3e230b254ff84b831e9f4aa59e1da1e170f50e99a6
-  data.tar.gz: 38c5f3b0051a55eca784dc970ff02f1e250b7a3f6d7ae5124ac27955c3f5ad40d1d598c8c58a9616ad942a563934af417dd886ffd5c3ce0bfb028972de25c08b
+  metadata.gz: 05757a4e2eb0895c4caa7174c48ec415d307c69f25ab55a84e41e59c6edaacd6263c2f0a8a26c3f4294e35a9372c502e5a73d99c2169fe364cf168f9e59c0091
+  data.tar.gz: 595532afb78715dc0b3610b841896ddf3845545889834c557c4a31f535c3ca02f66d91049609de7b98eb9cc57aa98dab3dd2377bcae3c723f177a81133af3e40

data/README.md

@@ -9,7 +9,9 @@ because hosting 100 apps costs $700 ($7x100) at you-know-where.com
 [![Dependencies](https://img.shields.io/gemnasium/meroku/meroku.svg?style=flat-square)](https://gemnasium.com/meroku/meroku)
 [![Issues](https://img.shields.io/github/issues/meroku/meroku.svg?style=flat-square)](https://github.com/meroku/meroku/issues)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+<br>
 [![Gem Version](https://badge.fury.io/rb/meroku.svg)](https://badge.fury.io/rb/meroku)
+<br>
 [![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/meroku/donate)
 
 
@@ -27,8 +29,31 @@ And then execute:
 
 ## Usage
 
+When inside a git repository containing a rails application,
+do a single command deployment by running
+
+    $ git push meroku master
+
+Get additional help by doing
+
     $ meroku --help
 
+    Usage: meroku [options]
+            --help                       Prints this help
+            --signup EMAIL,PASSWORD
+            --unregister EMAIL,PASSWORD
+            --login EMAIL,PASSWORD
+            --logout
+            --keys-add
+            --keys                       List already uploaded keys
+            --keys-remove ID
+            --create NAME                Create an app
+            --list-apps
+            --delete-app NAME
+    
+            --spawn MEROKU_SECRET        Spawn infrastructure
+            --despawn MEROKU_SECRET
+
 ## 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.

data/lib/meroku.rb

@@ -7,12 +7,14 @@ require 'open-uri'
 require 'net/ssh'
 require 'aws-sdk-ec2'
 require 'meroku/version'
+require 'meroku/response_handler'
 require 'meroku/user'
+require 'meroku/app'
+require 'meroku/key'
 require 'meroku/secrets'
 require 'meroku/shared'
 require 'meroku/aws'
 require 'meroku/node'
-require 'meroku/api'
 require 'meroku/options'
 require 'meroku/error'
 require 'meroku/cli'

data/lib/meroku/app.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Meroku
+  # Logic related to Consumer Apps
+  class App
+    extend Meroku::User
+    extend Meroku::ResponseHandler
+
+    def self.create(name)
+      raise Meroku::Error, 'Not in a git repository' unless Dir.exist?('.git')
+      data = { 'token' => saved_token, 'name' => name }.to_json
+      result = RestClient.post 'https://www.meroku.com/apps.json',
+                               data,
+                               content_type: :json
+      process_error(result)
+      process_success(result) { add_git_remote(result) }
+    end
+
+    def self.delete_app(name)
+      data = { 'name' => name, 'token' => saved_token }
+      result = RestClient::Request.execute(
+        method: :delete,
+        url: 'https://www.meroku.com/apps.json',
+        headers: { params: data }
+      )
+      process_error(result)
+      process_success(result)
+    end
+
+    def self.list_apps
+      result = RestClient.get 'https://www.meroku.com/apps.json',
+                              params: { 'token' => saved_token },
+                              content_type: :json
+      process_error(result)
+      process_success(result) do
+        JSON.parse(result).dig('data', 'apps_names').each do |k|
+          puts k
+        end
+      end
+    end
+
+    def self.add_git_remote(result)
+      username = JSON.parse(result).dig('data', 'username')
+      appname = JSON.parse(result).dig('data', 'name')
+      remote_uri = "#{username}@www.meroku.com:#{appname}.git"
+      Kernel.system('git remote remove meroku 2>/dev/null')
+      Kernel.system("git remote add meroku #{remote_uri}")
+    end
+  end
+end

data/lib/meroku/cli.rb

@@ -5,7 +5,6 @@ module Meroku
   # logic.
   class CLI
     include Meroku::Shared
-    include Meroku::Api
     attr_reader :options
 
     def initialize
@@ -14,7 +13,6 @@ module Meroku
 
     def run(args = ARGV)
       @options = Options.new.parse(args)
-      act_on_user_options
       act_on_options
     rescue Meroku::Success
       return 0
@@ -28,12 +26,31 @@ module Meroku
     private
 
     def act_on_options
-      if @options[:meroku_secret]
-        Meroku::Shared.secrets.meroku_secret = @options[:meroku_secret]
-      end
+      act_on_key_options
+      act_on_app_options
+      act_on_user_options
+      act_on_misc_options
+      true
+    end
+
+    def act_on_app_options
+      App.create(@options[:name]) if @options[:create]
+      App.list_apps if @options[:list_apps]
+      App.delete_app(@options[:name]) if @options[:delete_app]
+    end
+
+    def act_on_key_options
+      Key.upload if @options[:keys_add]
+      Key.list if @options[:keys]
+      Key.remove(@options[:key_id]) if @options[:keys_remove]
+    end
+
+    def act_on_misc_options
+      Meroku::Shared.secrets.meroku_secret = @options[:meroku_secret] \
+        if @options[:meroku_secret]
+
       Node.new if @options[:spawn]
       Meroku::Aws.terminate_all(tag: 'node') if @options[:despawn]
-      true
     end
 
     def act_on_user_options

data/lib/meroku/key.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Meroku
+  # Logic related to Ssh keys
+  # eg. Uploading of users public key
+  module Key
+    extend Meroku::ResponseHandler
+    extend Meroku::User
+
+    def self.list
+      result = RestClient.get 'https://www.meroku.com/keys.json',
+                              params: { 'token' => saved_token },
+                              content_type: :json
+      process_error(result)
+      process_success(result) do
+        JSON.parse(result).dig('data', 'keys_ids').each do |k|
+          puts "Key id: #{k}"
+        end
+      end
+    end
+
+    def self.upload
+      data = {
+        'token' => saved_token,
+        'key_name' => 'id_rsa.pub',
+        'key_data' => IO.read(Dir.home + '/.ssh/id_rsa.pub')
+      }.to_json
+      result = RestClient.post 'https://www.meroku.com/keys.json',
+                               data,
+                               content_type: :json
+      process_error(result)
+      process_success(result) { true }
+    end
+
+    def self.remove(key_id)
+      data = { 'id' => key_id, 'token' => saved_token }
+      result = RestClient::Request.execute(
+        method: :delete,
+        url: 'https://www.meroku.com/keys.json',
+        headers: { params: data }
+      )
+      process_error(result)
+      process_success(result)
+    end
+  end
+end

data/lib/meroku/options.rb

@@ -17,19 +17,42 @@ module Meroku
     def define_options(_args)
       OptionParser.new do |opts|
         opts.banner = 'Usage: meroku [options]'
+        opts.on('--help', 'Prints this help') { puts opts }
+        add_user_options(opts)
+        add_key_options(opts)
+        add_app_options(opts)
+        opts.separator ''
+        add_maintainer_options(opts)
+      end
+    end
 
-        opts.on('--help', 'Prints this help') do
-          puts opts
-        end
+    def add_key_options(opts)
+      option(opts, '--keys-add') { @options[:keys_add] = true }
+      option(opts, '--keys')     { @options[:keys] = true }
+      option(opts, '--keys-remove ID') do |key_id|
+        @options[:keys_remove] = true
+        @options[:key_id] = key_id
+      end
+    end
 
-        add_users_registration_options(opts)
-        add_users_login_options(opts)
-        opts.separator ''
-        add_maintainers_options(opts)
+    def add_app_options(opts)
+      option(opts, '--create NAME') do |name|
+        @options[:create] = true
+        @options[:name] = name
+      end
+      option(opts, '--list-apps') { @options[:list_apps] = true }
+      option(opts, '--delete-app NAME') do |name|
+        @options[:delete_app] = true
+        @options[:name] = name
       end
     end
 
-    def add_users_registration_options(opts)
+    def add_user_options(opts)
+      add_user_registration_options(opts)
+      add_user_login_options(opts)
+    end
+
+    def add_user_registration_options(opts)
       option(opts, '--signup EMAIL,PASSWORD', Array) do |list|
         @options[:signup] = true
         @options[:email] = list[0]
@@ -42,7 +65,7 @@ module Meroku
       end
     end
 
-    def add_users_login_options(opts)
+    def add_user_login_options(opts)
       option(opts, '--login EMAIL,PASSWORD', Array) do |list|
         @options[:login] = true
         @options[:email] = list[0]
@@ -53,7 +76,7 @@ module Meroku
       end
     end
 
-    def add_maintainers_options(opts)
+    def add_maintainer_options(opts)
       option(opts, '--spawn MEROKU_SECRET') do |meroku_secret|
         @options[:spawn] = true
         @options[:meroku_secret] = meroku_secret
@@ -87,7 +110,9 @@ module Meroku
   module OptionsHelp
     TEXT = {
       version:               'Display version.',
-      spawn:                 'Spawn infrastructure'
+      spawn:                 'Spawn infrastructure',
+      keys:                  'List already uploaded keys',
+      create:                'Create an app'
     }.freeze
   end
 end

data/lib/meroku/response_handler.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Meroku
+  # Logic related to making rest api calls to backend rails server
+  module ResponseHandler
+    def process_error(result)
+      raise Meroku::Error, JSON.parse(result).dig('errors') \
+        if JSON.parse(result).dig('errors')
+    end
+
+    def process_success(result)
+      id = JSON.parse(result).dig('data', 'id')
+      if id
+        yield(result) if block_given?
+        puts "OK [#{id}]"
+      end
+      raise Meroku::Success
+    end
+  end
+end

data/lib/meroku/user.rb

@@ -3,6 +3,8 @@
 module Meroku
   # Logic related to Users login, logout etc
   module User
+    extend Meroku::ResponseHandler
+
     def self.login(email, password)
       data = { 'email' => email, 'password' => password }.to_json
       result = RestClient.post 'https://www.meroku.com/login.json',
@@ -12,22 +14,8 @@ module Meroku
       process_success(result) { |x| save_token(x) }
     end
 
-    def self.process_error(result)
-      raise Meroku::Error, JSON.parse(result).dig('errors') \
-        if JSON.parse(result).dig('errors')
-    end
-
-    def self.process_success(result)
-      id = JSON.parse(result).dig('data', 'id')
-      if id
-        yield(result) if block_given?
-        puts "OK [#{id}]"
-      end
-      raise Meroku::Success
-    end
-
     def self.save_token(x)
-      token = JSON.parse(x).dig('data', 'id')
+      token = JSON.parse(x).dig('data', 'token')
       IO.write("#{Dir.home}/.meroku_token", token) if token
     end
 
@@ -62,5 +50,12 @@ module Meroku
       file = "#{Dir.home}/.meroku_token"
       File.delete(file) if File.exist?(file)
     end
+
+    def saved_token
+      token_path = Dir.home + '/.meroku_token'
+      IO.read(token_path)
+    rescue StandardError => e
+      raise Meroku::Error, "Login failed #{e.class}"
+    end
   end
 end

data/lib/meroku/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meroku
-  VERSION = '2.0.24'
+  VERSION = '2.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meroku
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Meroku System
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -175,12 +175,14 @@ files:
 - data/etc_nginx_sites-enabled_template
 - guard
 - lib/meroku.rb
-- lib/meroku/api.rb
+- lib/meroku/app.rb
 - lib/meroku/aws.rb
 - lib/meroku/cli.rb
 - lib/meroku/error.rb
+- lib/meroku/key.rb
 - lib/meroku/node.rb
 - lib/meroku/options.rb
+- lib/meroku/response_handler.rb
 - lib/meroku/secrets.rb
 - lib/meroku/shared.rb
 - lib/meroku/user.rb

data/lib/meroku/api.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Meroku
-  # Logic related to making rest api calls to backend rails server
-  module Api
-    def post(data)
-      # response = RestClient.post "https://www.example.net", data.to_json
-      # puts "DB8 #{response.inspect}"
-      # true
-      # response = RestClient.post(url, data.to_json,
-      #                            timeout: 1,
-      #                            content_type: :json,
-      #                            accept: :json)
-      # r = JSON.parse(response)
-      # yield(r["data"]) if r.key?("data")
-      # return unless r.key?("errors") && r["errors"].size.positive?
-      # puts "error: #{r['errors'].map { |x| x['detail'] }.join('. ')}"
-    end
-  end
-end