meroku 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816206f9563347d62b87cfdc0efe4a2245655603
-  data.tar.gz: f324cd878df16907747cf2f8026ed2fa74ac1893
+  metadata.gz: 6f904e491e3b5db4cac84dd8df856e3f261ed524
+  data.tar.gz: 50bc9918fee760e9023221be2ea2331fc4e3a515
 SHA512:
-  metadata.gz: 81712892db6f34cce5e201865d6c1147ab69f5e0dbe7b9be63a2b7bda74b1d647c24195b4a6a30f7c6a9529f6112c8cf72e70cb407d7c65d3d02f036ea8c1c19
-  data.tar.gz: 79120b685b9abba3109b8a4348d67fb342e9fd19d8c2c829b42a89e9c6bf9ad78fc613bb664ec0e8af38d891509773cbd522e05b4258c9355034fe4c8c0431ed
+  metadata.gz: bd05e025fb8078879f8950ce154d9d2b5d775f5f76cb1cb53aba11c1a6006cf750d5d8b9220eb2390ddc3f3e230b254ff84b831e9f4aa59e1da1e170f50e99a6
+  data.tar.gz: 38c5f3b0051a55eca784dc970ff02f1e250b7a3f6d7ae5124ac27955c3f5ad40d1d598c8c58a9616ad942a563934af417dd886ffd5c3ce0bfb028972de25c08b

data/.travis.yml

@@ -3,3 +3,16 @@ language: ruby
 rvm:
   - 2.4.2
 before_install: gem install bundler -v 1.15.4
+
+env:
+  global:
+    - CC_TEST_REPORTER_ID=61d42f990728bb450857fbd8b1f09d650f929f086d0d2d7d0c13ead9d33b77e2
+    - COVERAGE_PATH="coverage/"
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -3,11 +3,10 @@ Meroku
 
 because hosting 100 apps costs $700 ($7x100) at you-know-where.com
 
-[![Quality](https://img.shields.io/codeclimate/github/meroku/meroku.svg?style=flat-square)](https://codeclimate.com/github/meroku/meroku)
+[![Maintainability](https://api.codeclimate.com/v1/badges/cfec7757799809e85194/maintainability)](https://codeclimate.com/github/meroku/meroku/maintainability)
 [![Coverage](https://img.shields.io/codeclimate/coverage/github/meroku/meroku.svg?style=flat-square)](https://codeclimate.com/github/meroku/meroku)
 [![Build](https://img.shields.io/travis-ci/meroku/meroku.svg?style=flat-square)](https://travis-ci.org/meroku/meroku)
 [![Dependencies](https://img.shields.io/gemnasium/meroku/meroku.svg?style=flat-square)](https://gemnasium.com/meroku/meroku)
-[![Downloads](https://img.shields.io/gem/meroku/meroku.svg?style=flat-square)](https://rubygems.org/gems/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)
 [![Gem Version](https://badge.fury.io/rb/meroku.svg)](https://badge.fury.io/rb/meroku)

data/lib/meroku/aws.rb

@@ -5,28 +5,34 @@ module Meroku
   module Aws
     include Meroku::Shared
 
-    def make_instance
-      @instance_id = Meroku::Shared.ec2_client.run_instances(
+    def default_instance_params
+      {
         image_id: 'ami-841f46ff',
         min_count: 1,
         max_count: 1,
         key_name: 'meroku.id_rsa',
         instance_type: 't2.micro',
         tag_specifications: [tag]
-      ).instances.first.instance_id
+      }
+    end
+
+    def make_instance
+      @instance_id =
+        Meroku::Shared \
+        .ec2_client  \
+        .run_instances(default_instance_params) \
+        .instances.fetch(0).instance_id
+      puts 'waiting'
+      Meroku::Shared.ec2_client.wait_until(
+        :instance_running,
+        instance_ids: [@instance_id]
+      )
     end
 
     def associate_address
-      retries ||= 0
-      sleep 10
-      begin
-        puts Meroku::Shared.ec2_client.associate_address(
-          allocation_id: allocation_id, instance_id: instance_id
-        ).class
-        sleep 20
-      rescue ::Aws::EC2::Errors::InvalidInstanceID
-        (retries += 1) < 10 ? retry : raise
-      end
+      Meroku::Shared.ec2_client.associate_address(
+        allocation_id: allocation_id, instance_id: instance_id
+      )
     end
 
     # Private S3 Bucket

data/lib/meroku/cli.rb

@@ -14,9 +14,14 @@ module Meroku
 
     def run(args = ARGV)
       @options = Options.new.parse(args)
+      act_on_user_options
       act_on_options
-    rescue Meroku::Error => e
-      puts "Error: #{e.message}"
+    rescue Meroku::Success
+      return 0
+    rescue StandardError => e
+      print 'Error:'
+      print " #{e.message}" if e.message
+      print " <#{e.class}>\n"
       return 2
     end
 
@@ -27,10 +32,15 @@ module Meroku
         Meroku::Shared.secrets.meroku_secret = @options[:meroku_secret]
       end
       Node.new if @options[:spawn]
-      User.login(@options[:email], @options[:password]) if @options[:login]
-      User.logout if @options[:logout]
       Meroku::Aws.terminate_all(tag: 'node') if @options[:despawn]
       true
     end
+
+    def act_on_user_options
+      User.login(@options[:email], @options[:password]) if @options[:login]
+      User.logout if @options[:logout]
+      User.signup(@options[:email], @options[:password]) if @options[:signup]
+      User.unregister(@options) if @options[:unregister]
+    end
   end
 end

data/lib/meroku/error.rb

@@ -6,6 +6,5 @@ module Meroku
   # immediately, rather than carrying on
   class Error < StandardError; end
 
-  class WipError < Error; end
-  class LoginFailed < Error; end
+  class Success < RuntimeError; end
 end

data/lib/meroku/node.rb

@@ -105,7 +105,7 @@ module Meroku
       execute_script <<~HEREDOC
         cd ~/backend_api; sudo gem install bundler; bundle;
         cd ~/backend_api; SECRET=#{Meroku::Shared.secrets.meroku_secret} RAILS_ENV=production bundle exec rake db:migrate db:seed
-        cd ~/backend_api; SECRET=#{Meroku::Shared.secrets.meroku_secret} SECRET_KEY_BASE=#{Meroku::Shared.secrets.meroku_secret} RAILS_ENV=production bundle exec puma -d -b unix:///home/ubuntu/backend_api/tmp/backend_api.sock
+        cd ~/backend_api; SECRET=#{Meroku::Shared.secrets.meroku_secret} SECRET_KEY_BASE=#{Meroku::Shared.secrets.meroku_secret} RAILS_ENV=production bundle exec unicorn -D -l unix:///home/ubuntu/backend_api/tmp/backend_api.sock -c config/unicorn.rb
         sudo /usr/sbin/nginx -s reload
       HEREDOC
     end

data/lib/meroku/options.rb

@@ -22,13 +22,27 @@ module Meroku
           puts opts
         end
 
-        add_users_options(opts)
+        add_users_registration_options(opts)
+        add_users_login_options(opts)
         opts.separator ''
         add_maintainers_options(opts)
       end
     end
 
-    def add_users_options(opts)
+    def add_users_registration_options(opts)
+      option(opts, '--signup EMAIL,PASSWORD', Array) do |list|
+        @options[:signup] = true
+        @options[:email] = list[0]
+        @options[:password] = list[1]
+      end
+      option(opts, '--unregister EMAIL,PASSWORD', Array) do |list|
+        @options[:unregister] = true
+        @options[:email] = list[0]
+        @options[:password] = list[1]
+      end
+    end
+
+    def add_users_login_options(opts)
       option(opts, '--login EMAIL,PASSWORD', Array) do |list|
         @options[:login] = true
         @options[:email] = list[0]

data/lib/meroku/user.rb

@@ -4,22 +4,63 @@ module Meroku
   # Logic related to Users login, logout etc
   module User
     def self.login(email, password)
-      url = 'https://www.meroku.com/login.json'
       data = { 'email' => email, 'password' => password }.to_json
-      result = RestClient.post url,
+      result = RestClient.post 'https://www.meroku.com/login.json',
                                data,
                                content_type: :json
-      token = JSON.parse(result.body)['token']
-      IO.write("#{Dir.home}/.meroku_token", token)
-      puts 'Logged in'
-    rescue RestClient::Unauthorized
-      raise Meroku::LoginFailed, 'Login Failed'
+      process_error(result)
+      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')
+      IO.write("#{Dir.home}/.meroku_token", token) if token
     end
 
     def self.logout
       file = "#{Dir.home}/.meroku_token"
-      File.delete(file) if File.exist?(file)
+      File.delete(file)
       puts 'Logged out'
+      raise Meroku::Success
+    end
+
+    def self.signup(email, password)
+      data = { 'email' => email, 'password' => password }.to_json
+      result = RestClient.post 'https://www.meroku.com/registrations.json',
+                               data,
+                               content_type: :json
+      process_error(result)
+      process_success(result) { |x| save_token(x) }
+    end
+
+    def self.unregister(options)
+      data = { 'email' => options[:email], 'password' => options[:password] }
+      result = RestClient::Request.execute(
+        method: :delete,
+        url: 'https://www.meroku.com/registrations.json',
+        headers: { params: data }
+      )
+      process_error(result)
+      process_success(result) { delete_token }
+    end
+
+    def self.delete_token
+      file = "#{Dir.home}/.meroku_token"
+      File.delete(file) if File.exist?(file)
     end
   end
 end

data/lib/meroku/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meroku
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Meroku System
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug