meroku 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 644b170886bbccc668dcbd9f7c85e12fd7f3fdd7
-  data.tar.gz: f2f9a6ceac6218ca01981f77999f3493976bb20e
+  metadata.gz: 816206f9563347d62b87cfdc0efe4a2245655603
+  data.tar.gz: f324cd878df16907747cf2f8026ed2fa74ac1893
 SHA512:
-  metadata.gz: d4a8a319a22ac72f047737ac20a66ab94b8e42a83a4542e6b3017dbb253e51bf8a9dfafc75888796a9d400d7733ca126a6a68949dad12c029486406851677721
-  data.tar.gz: 34497e672d4a3d8f5a271610ebaaee77549bb6295aa0e8bc1394b148bf80998f86e29fbb8fda5ff61b268d5985abf32db36f01acbae8d23aec60685a76beb099
+  metadata.gz: 81712892db6f34cce5e201865d6c1147ab69f5e0dbe7b9be63a2b7bda74b1d647c24195b4a6a30f7c6a9529f6112c8cf72e70cb407d7c65d3d02f036ea8c1c19
+  data.tar.gz: 79120b685b9abba3109b8a4348d67fb342e9fd19d8c2c829b42a89e9c6bf9ad78fc613bb664ec0e8af38d891509773cbd522e05b4258c9355034fe4c8c0431ed

data/.gitignore

@@ -7,4 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-.env

data/.travis.yml

@@ -1,15 +1,5 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=3e24c46585775714440d71d0412f6b27b469f8709ca05483191a43a2dc39dc6c
 sudo: false
 language: ruby
 rvm:
   - 2.4.2
-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
-
 before_install: gem install bundler -v 1.15.4
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Guardfile

@@ -0,0 +1,43 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard :minitest do
+  watch(%r{^.*})
+  # with Minitest::Unit
+  #watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+  #watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  #watch(%r{^test/test_helper\.rb$})      { 'test' }
+
+  # with Minitest::Spec
+  # watch(%r{^spec/(.*)_spec\.rb$})
+  # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
+
+  # Rails 4
+  # watch(%r{^app/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/application_controller\.rb$}) { 'test/controllers' }
+  # watch(%r{^app/controllers/(.+)_controller\.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
+  # watch(%r{^app/views/(.+)_mailer/.+})                    { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+  # watch(%r{^lib/(.+)\.rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
+  # watch(%r{^test/.+_test\.rb$})
+  # watch(%r{^test/test_helper\.rb$}) { 'test' }
+
+  # Rails < 4
+  # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r{^app/helpers/(.*)\.rb$})     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r{^app/models/(.*)\.rb$})      { |m| "test/unit/#{m[1]}_test.rb" }
+end

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Meroku
+Copyright (c) 2017 Meroku System
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,108 +1,48 @@
-
-
-[![Build Status](https://travis-ci.org/meroku/meroku.svg?branch=master)](https://travis-ci.org/meroku/meroku)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/cfec7757799809e85194/test_coverage)](https://codeclimate.com/github/meroku/meroku/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/cfec7757799809e85194/maintainability)](https://codeclimate.com/github/meroku/meroku/maintainability)
-[![Dependency Status](https://gemnasium.com/badges/github.com/meroku/meroku.svg)](https://gemnasium.com/github.com/meroku/meroku)
+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)
+[![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)
-[![Gratipay](https://img.shields.io/gratipay/user/meroku.svg)](https://gratipay.com/meroku/)
+[![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/meroku/donate)
 
-## My Heroku (Meroku), because hosting 100 apps costs $700 ($7x100) at heroku.com
 
-Ruby on Rails is a popular web framework written in Ruby. This guide covers using Rails 5 on Meroku. To follow along, you need
+## Installation
 
-- Basic Ruby/Rails knowledge.
-- A locally installed version of Ruby 2.4.2+, Rubygems, Bundler, and Rails 5+.
-- Basic Git knowledge.
+Make sure you have the latest stable ruby installed
 
+```bash
+ruby --version
+```
 
-Install the meroku gem on your local workstation
+And then execute:
 
     $ gem install meroku
 
-Once installed, you’ll have access to the `$ meroku` command from your command shell.
-
-    $ meroku signup     # if you haven't done already
-
-Make sure you're running the latest version of ruby
-
-    $ cd ~; ruby --version
-    ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-darwin16]
-
-Install the rails gem if you haven't done already
-
-    $ gem install rails --no-ri --no-rdoc
-    Successfully installed rails-5.1.4
-    1 gem installed
-
-
-Then create a new app:
-
-    $ rails new myapp --database=postgresql
-
-Then move into your application directory.
-
-    $ cd myapp
-
-Mention you want to the latest ruby version
-
-    $ echo "2.4.2" > .ruby-version
-
-And commit it
-
-    $ git add --all; git commit -m "Added ruby version";
-
-Register your application with meroku
-
-    $ meroku create
-    Creating app... done
-
-Add your public key to meroku
-
-    $ meroku keys:add
-
-And deploy
-
-    $ git push meroku master
-    $ meroku run rake db:migrate
-
-
-
-## DOCUMENTATION FOR MAINTAINERS
-
-
-### Secrets
-
-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,
-
-    export SECRET="example"
+## Usage
 
+    $ meroku --help
 
-### Commands
+## Development
 
-    $ meroku infrastructure spawn
-    $ meroku infrastructure despawn
+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.
 
-    $ rubocop -D -F --except FrozenStringLiteralComment,StringLiterals,MutableConstant lib/
-    Inspecting 15 files
-    ...............
-    
-    15 files inspected, no offenses detected
-    $ 
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-### TODO
 
-    - Only latest stable ruby is supported at the moment
-    - Only latest stable rails is supported at the moment
-    - Only RAILS_ENV=procution is supported at the moment
-    - Only puma is supported at the moment
+    $ ./guard    # keeps an eye on test fails and rubocop warnings
 
-### To Run tests
+## Contributing
 
-    rake
+Bug reports and pull requests are welcome on GitHub at https://github.com/meroku/meroku.
 
+## License
 
-    
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/meroku

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift("#{__dir__}/../lib")
 require 'meroku'
 
-Meroku::CLI::Session.new ARGV
+cli = Meroku::CLI.new
+result = 0
+result = cli.run
+exit result

data/guard

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+trap "echo Exited!; exit;" SIGINT SIGTERM
+
+result_tests_coverage='na'
+result_tests='na'
+result_rubocop='na'
+while :
+do
+  echo "                                                                       $result_tests $result_tests_coverage $result_rubocop";
+  rm /tmp/result_tests_coverage 2>/dev/null
+  result_tests_coverage='na'
+  result_tests='na'
+  result_rubocop='na'
+  fswatch --latency=0.3 -1 ./ >/dev/null
+  reset
+  bundle exec rake
+  result_tests=$?
+  if [ $result_tests -ne 0 ]; then continue; fi;
+  result_tests_coverage=$(cat /tmp/result_tests_coverage 2>/dev/null)
+  rubocop lib/
+  result_rubocop=$?
+done
+
+

data/lib/meroku.rb

@@ -1,21 +1,18 @@
-require "fileutils"
-require "active_support/core_ext/object/try"
-require "net/ssh"
-require "net/http"
-require "escape"
-require "aws-sdk-ec2"
-require "dotenv"
-require "byebug"
-require "rest-client"
-require "meroku/extensions"
-require "meroku/aws"
-require "meroku/version"
-require "meroku/tunnelable"
-require "meroku/node"
-require "meroku/infrastructure"
-require "meroku/api"
-require "meroku/cli"
+# frozen_string_literal: true
 
-# My Heroku (Meroku)
-module Meroku
-end
+require 'optparse'
+require 'byebug'
+require 'rest-client'
+require 'open-uri'
+require 'net/ssh'
+require 'aws-sdk-ec2'
+require 'meroku/version'
+require 'meroku/user'
+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/api.rb

@@ -1,8 +1,20 @@
-require 'meroku/api/request'
+# frozen_string_literal: true
 
 module Meroku
-  # The api is the rails app/service running on the ec2 server
-  # handling login, logout, keys:add etc
+  # 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

data/lib/meroku/aws.rb

@@ -1,14 +1,77 @@
-require 'meroku/aws/ec2'
+# frozen_string_literal: true
 
 module Meroku
-  # Stuff related to Amazon Web Services
+  # Mostly wrappers around aws library functions
   module Aws
-    IP = '34.239.241.218'
+    include Meroku::Shared
 
-    KEY_NAME = "#{Dir.home}/.meroku/meroku.id_rsa"
+    def make_instance
+      @instance_id = Meroku::Shared.ec2_client.run_instances(
+        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 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
+    end
+
+    # Private S3 Bucket
+    # The only security here is not no one knows the bucket name,
+    # which is a uuid
+    def bucket
+      "http://s3.amazonaws.com/#{Meroku::Shared.secrets.meroku_secret}/"
+    end
+
+    def self.terminate_all(tag: nil)
+      Meroku::Shared.ec2_client.describe_instances(
+        filters: running_filter(tag)
+      ).reservations.map do |r|
+        id = r.instances.first.instance_id
+        puts "Will terminate #{id}"
+        Meroku::Shared.ec2_client.terminate_instances(instance_ids: [id])
+      end
+    end
+
+    # Our elastic ip allocation
+    def allocation_id
+      'eipalloc-139f7823'
+    end
+
+    def ip_address
+      '34.239.241.218'
+    end
+
+    def tag
+      {
+        resource_type: 'instance',
+        tags: [
+          {
+            key: 'Name',
+            value: 'node'
+          }
+        ]
+      }
+    end
 
-    def self.bucket_url
-      "https://s3.amazonaws.com/#{ENV['SECRET']}"
+    def self.running_filter(tag)
+      [
+        { name: 'tag:Name', values: [tag] },
+        { name: 'instance-state-name', values: %w[running pending] }
+      ]
     end
   end
 end

data/lib/meroku/cli.rb

@@ -1,104 +1,36 @@
-require 'meroku/cli/help'
-require 'meroku/cli/secrets'
-require 'meroku/cli/session'
+# frozen_string_literal: true
 
 module Meroku
-  # The CLI is used by end users and also maintainers
-  module CLI
-    include Meroku::Aws::Ec2
+  # The CLI is a class responsible of handling all the command line interface
+  # logic.
+  class CLI
+    include Meroku::Shared
+    include Meroku::Api
+    attr_reader :options
 
-    def signup
-      email, pw = Meroku::Extensions.mgets(%i[email password])
-      Meroku::Api::Request.post(
-        'https://www.meroku.com/users.json',
-        user: { email: email, password: pw, password_confirmation: pw }
-      ) do |response|
-        puts "Signed up #{response['attributes']['email']}"
-        save_setting('apiusername', response['attributes']['apiusername'])
-        save_setting('apisecret', response['attributes']['apisecret'])
-      end
-      true
+    def initialize
+      @options = {}
     end
 
-    def login
-      email, password = Meroku::Extensions.mgets(%i[email password])
-      Meroku::Api::Request.post(
-        'https://www.meroku.com/users/sign_in.json',
-        user: { email: email, password: password }
-      ) do |response|
-        puts "Signed in as #{response['attributes']['email']}"
-        save_setting('apiusername', response['attributes']['apiusername'])
-        save_setting('apisecret', response['attributes']['apisecret'])
-      end
-      true
+    def run(args = ARGV)
+      @options = Options.new.parse(args)
+      act_on_options
+    rescue Meroku::Error => e
+      puts "Error: #{e.message}"
+      return 2
     end
 
-    def logout
-      [
-        "#{Dir.home}/.meroku/.apiusername",
-        "#{Dir.home}/.meroku/.apisecret"
-      ].each do |f|
-        File.delete(f) if File.exist?(f)
-      end
-      true
-    end
+    private
 
-    def create
-      Meroku::Api::Request.post(
-        'https://www.meroku.com/apps.json',
-        app: { name: 'unnamed' }, apisecret: `cat ~/.meroku/.apisecret`.chomp
-      ) do |response|
-        puts "Created #{response['attributes']['name']}, adding git remote"
-        add_git_remote(
-          'meroku',
-          "#{apiusername}@www.meroku.com:#{response['attributes']['name']}.git"
-        )
+    def act_on_options
+      if @options[:meroku_secret]
+        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 apiusername
-      `cat ~/.meroku/.apiusername.chomp`
-    end
-
-    def add_git_remote(name, uri)
-      puts "git remote remove #{name}"
-      `git remote remove #{name} 2>/dev/null`
-      puts "git remote add #{name} #{uri}"
-      `git remote add #{name} #{uri}`
-    end
-
-    def keys_add
-      file = "#{Dir.home}/.ssh/id_rsa.pub"
-      apisecret = `cat ~/.meroku/.apisecret`.chomp
-      abort "error: #{file} not found" unless File.exist?(file)
-      Meroku::Api::Request.post(
-        'https://www.meroku.com/publickeys.json',
-        publickey: { name: 'id_rsa.pub', data: `cat ~/.ssh/id_rsa.pub`.chomp },
-        apisecret: apisecret
-      ) do |response|
-        puts "Added #{response['attributes']['name']}"
-      end
-      true
-    end
-
-    def spawn
-      Meroku::CLI::Secrets.load(admin: true)
-      node = Meroku::Node.new
-      node.associate_address.configure_keys.add_sources.ubuntu_updates
-      node.install_packages.database_inits.git_clone.nginx_configs.start_rails
-      true
-    end
-
-    def despawn
-      Meroku::CLI::Secrets.load(admin: true)
-      Meroku::Infrastructure.each_server(&:shutdown)
-      true
-    end
-
-    def save_setting(name, value)
-      FileUtils.mkdir_p "#{Dir.home}/.meroku"
-      IO.write("#{Dir.home}/.meroku/.#{name}", value)
-    end
   end
 end