RubyGems - meroku - Versions diffs - 2.0.8 → 2.0.9 - Mend

meroku 2.0.8 → 2.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (81) hide show

checksums.yaml +4 -4
data/README.md +9 -5
data/bin/meroku +1 -1
data/circle.yml +23 -0
data/frontend/Gemfile +5 -2
data/frontend/Gemfile.lock +5 -2
data/frontend/app/controllers/application_controller.rb +1 -0
data/frontend/app/controllers/apps_controller.rb +46 -48
data/frontend/app/controllers/publickeys_controller.rb +45 -46
data/frontend/app/controllers/users/registrations_controller.rb +0 -15
data/frontend/app/controllers/users/sessions_controller.rb +12 -3
data/frontend/app/lib/cmd.rb +11 -0
data/frontend/app/models/app.rb +18 -11
data/frontend/app/models/publickey.rb +1 -1
data/frontend/app/models/user.rb +5 -4
data/frontend/app/policies/application_policy.rb +53 -0
data/frontend/app/policies/publickey_policy.rb +7 -0
data/frontend/app/serializable/serializable_user.rb +2 -1
data/frontend/app/views/layouts/application.html.erb +1 -1
data/frontend/config/database.yml +72 -10
data/frontend/config/routes.rb +6 -14
data/frontend/db/migrate/20171028150506_add_apisecret_to_users.rb +6 -0
data/frontend/etc_nginx_sites-enabled_default +1 -1
data/frontend/public/Meroku.html +140 -0
data/frontend/public/Meroku/Api.html +129 -0
data/frontend/public/Meroku/Api/Request.html +221 -0
data/frontend/public/Meroku/Aws.html +212 -0
data/frontend/public/Meroku/Aws/Ec2.html +477 -0
data/frontend/public/Meroku/CLI.html +784 -0
data/frontend/public/Meroku/CLI/AdminUser.html +192 -0
data/frontend/public/Meroku/CLI/Help.html +224 -0
data/frontend/public/Meroku/CLI/Secrets.html +191 -0
data/frontend/public/Meroku/CLI/Session.html +460 -0
data/frontend/public/Meroku/CLI/User.html +182 -0
data/frontend/public/Meroku/Extensions.html +405 -0
data/frontend/public/Meroku/Infrastructure.html +279 -0
data/frontend/public/Meroku/Infrastructure/Node.html +785 -0
data/frontend/public/Meroku/Infrastructure/Server.html +373 -0
data/frontend/public/Meroku/Node.html +845 -0
data/frontend/public/Meroku/Tunnel.html +701 -0
data/frontend/public/Meroku/Tunnelable.html +243 -0
data/frontend/public/_index.html +273 -0
data/frontend/public/class_list.html +51 -0
data/frontend/public/css/common.css +1 -0
data/frontend/public/css/full_list.css +58 -0
data/frontend/public/css/style.css +492 -0
data/frontend/public/file.README.html +181 -0
data/frontend/public/file_list.html +56 -0
data/frontend/public/frames.html +17 -0
data/frontend/public/index.html +181 -0
data/frontend/public/js/app.js +248 -0
data/frontend/public/js/full_list.js +216 -0
data/frontend/public/js/jquery.js +4 -0
data/frontend/public/method_list.html +395 -0
data/frontend/public/robots.txt +2 -1
data/frontend/public/top-level-namespace.html +110 -0
data/frontend/test/policies/publickey_policy_test.rb +19 -0
data/lib/meroku.rb +9 -7
data/lib/meroku/api.rb +8 -0
data/lib/meroku/api/request.rb +17 -0
data/lib/meroku/aws.rb +14 -0
data/lib/meroku/aws/ec2.rb +59 -0
data/lib/meroku/cli.rb +80 -81
data/lib/meroku/cli/help.rb +27 -0
data/lib/meroku/cli/secrets.rb +13 -0
data/lib/meroku/cli/session.rb +32 -51
data/lib/meroku/extensions.rb +32 -0
data/lib/meroku/infrastructure.rb +14 -17
data/lib/meroku/infrastructure/server.rb +20 -0
data/lib/meroku/node.rb +113 -0
data/lib/meroku/tunnelable.rb +31 -0
data/lib/meroku/version.rb +1 -1
data/modified-cedar-14.sh +0 -4
metadata +50 -9
data/frontend/app/controllers/pages_controller.rb +0 -4
data/frontend/app/views/pages/landing.html.erb +0 -2
data/frontend/db/migrate/20171025193627_add_token_to_users.rb +0 -5
data/lib/meroku/cli/admin_user.rb +0 -20
data/lib/meroku/cli/user.rb +0 -14
data/lib/meroku/infrastructure/node.rb +0 -102
data/lib/meroku/tunnel.rb +0 -56

data/frontend/public/robots.txt CHANGED Viewed

@@ -1 +1,2 @@
-# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+User-agent: *
+Disallow: /

data/frontend/public/top-level-namespace.html ADDED Viewed

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Top Level Namespace
+    &mdash; Documentation by YARD 0.9.9
+</title>
+  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
+<script type="text/javascript" charset="utf-8">
+  pathId = "";
+  relpath = '';
+</script>
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+    <a href="_index.html">Index</a> &raquo;
+    <span class="title">Top Level Namespace</span>
+</div>
+        <div id="search">
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+</div>
+        <div class="clear"></div>
+      </div>
+      <div id="content"><h1>Top Level Namespace
+</h1>
+<div class="box_info">
+</div>
+<h2>Defined Under Namespace</h2>
+<p class="children">
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Meroku.html" title="Meroku (module)">Meroku</a></span>
+</p>
+</div>
+      <div id="footer">
+  Generated on Tue Oct 31 19:39:54 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.4.2).
+</div>
+    </div>
+  </body>
+</html>

data/frontend/test/policies/publickey_policy_test.rb ADDED Viewed

@@ -0,0 +1,19 @@
+require 'test_helper'
+class PublickeyPolicyTest < ActiveSupport::TestCase
+  def test_scope
+  end
+  def test_show
+  end
+  def test_create
+  end
+  def test_update
+  end
+  def test_destroy
+  end
+end

data/lib/meroku.rb CHANGED Viewed

@@ -1,19 +1,21 @@
+require "fileutils"
 require "active_support/core_ext/object/try"
 require "net/ssh"
-require 'net/http'
+require "net/http"
 require "escape"
 require "aws-sdk-ec2"
 require "dotenv"
 require "byebug"
-require 'rest-client'
+require "rest-client"
+require "meroku/extensions"
+require "meroku/aws"
 require "meroku/version"
-require "meroku/tunnel"
-require "meroku/cli/user"
-require "meroku/cli/admin_user"
+require "meroku/tunnelable"
+require "meroku/node"
 require "meroku/infrastructure"
+require "meroku/api"
 require "meroku/cli"
+# My Heroku (Meroku)
 module Meroku
 end

data/lib/meroku/api.rb ADDED Viewed

@@ -0,0 +1,8 @@
+require 'meroku/api/request'
+module Meroku
+  # The api is the rails app/service running on the ec2 server
+  # handling login, logout, keys:add etc
+  module Api
+  end
+end

data/lib/meroku/api/request.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module Meroku
+  module Api
+    # Wrapper around RestClient.post
+    module Request
+      def self.post(url, data)
+        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
+end

data/lib/meroku/aws.rb ADDED Viewed

@@ -0,0 +1,14 @@
+require 'meroku/aws/ec2'
+module Meroku
+  # Stuff related to Amazon Web Services
+  module Aws
+    IP = '34.239.241.218'
+    KEY_NAME = '~/crypto/meroku/meroku.id_rsa'
+    def self.bucket_url
+      "http://www.sam-we.com/dropbox/meroku-#{ENV['SECRET']}"
+    end
+  end
+end

data/lib/meroku/aws/ec2.rb ADDED Viewed

@@ -0,0 +1,59 @@
+module Meroku
+  module Aws
+    # Logic related to the ec2 instances we use as servers
+    module Ec2
+      def tag
+        {
+          resource_type: 'instance',
+          tags: [
+            {
+              key: 'Name',
+              value: 'node'
+            }
+          ]
+        }
+      end
+      def make_instance
+        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
+      end
+      def ec2_client
+        ::Aws::EC2::Client.new(
+          region: 'us-east-1',
+          credentials: ::Aws::Credentials.new(
+            ENV['AWS_ACCESS_KEY'],
+            ENV['AWS_SECRET']
+          )
+        )
+      end
+      def self.ec2_client
+        ::Aws::EC2::Client.new(
+          region: 'us-east-1',
+          credentials: ::Aws::Credentials.new(
+            ENV['AWS_ACCESS_KEY'],
+            ENV['AWS_SECRET']
+          )
+        )
+      end
+      def self.associate_address(eipalloc, id)
+        retries ||= 0
+        ec2_client.associate_address(allocation_id: eipalloc, instance_id: id)
+      rescue ::Aws::EC2::Errors::InvalidInstanceID
+        sleep 1
+        puts 'retrying associate_address()'
+        retry if (retries += 1) < 15
+      end
+    end
+  end
+end

data/lib/meroku/cli.rb CHANGED Viewed

@@ -1,105 +1,104 @@
-require "meroku/cli/session"
+require 'meroku/cli/help'
+require 'meroku/cli/secrets'
+require 'meroku/cli/session'
 module Meroku
+  # The CLI is used by end users and also maintainers
   module CLI
-    def help
-      <<~HEREDOC
-      Usage: meroku command subcommand
-      Examples
-      meroku signup    # if you havent done already
-      meroku create
-      meroku keys:add
-      meroku infrastrucuture spawn    # Spawns server
-      HEREDOC
-    end
+    include Meroku::Aws::Ec2
     def signup
-      print "Email: "
-      email = STDIN.gets
-      print "Password: "
-      password = STDIN.noecho(&:gets).chomp
-      print "\n"
-      url = "https://www.meroku.com/users.json"
-      response_json = RestClient.post url, {:user=>{:email => email, :password => password, :password_confirmation => password}}.to_json, timeout: 1, :content_type => :json, :accept => :json
-      if JSON.parse(response_json)["errors"] && JSON.parse(response_json)["errors"].size > 0
-        puts "error: #{JSON.parse(response_json)["errors"].map{|x| x["detail"]}.join(".")}"
-      else
-        email = JSON.parse(response_json)["data"]["attributes"]["email"]
-        token = JSON.parse(response_json)["data"]["attributes"]["token"]
-        puts "Signed up #{email}"
-        dirname = File.dirname("#{Dir.home}/.meroku")
-        FileUtils.mkdir(dirname) if !File.directory?(dirname)
-        File.open("#{Dir.home}/.meroku/.token", 'w') { |file| file.write(token) }
+      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
     end
-    def keys_add(session)
-      if !File.exist? "#{Dir.home}/.ssh/id_rsa.pub"
-        puts "error: File #{Dir.home}/.ssh/id_rsa.pub not found"
-        puts "You can use this command to generate a key:"
-        puts "    ssh-keygen -t rsa"
-        return nil
-      end
-      name = "id_rsa.pub"
-      data = `cat ~/.ssh/id_rsa.pub`.chomp
-      url = "https://www.meroku.com/publickeys.json"
-      response_json = RestClient.post url, {:publickey=>{:name => name, :data=>data}, :token=>session.token}.to_json, timeout: 1, :content_type => :json, :accept => :json
-      if JSON.parse(response_json)["errors"] && JSON.parse(response_json)["errors"].size > 0
-        puts "error: #{JSON.parse(response_json)["errors"].map{|x| x["detail"]}.join(".")}"
-      else
-        name = JSON.parse(response_json)["data"]["attributes"]["name"]
-        puts "Added #{name}"
+    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
     end
-    def create
-      url = "https://www.meroku.com/apps.json"
-      token = `cat ~/.meroku/.token`.chomp
-      response_json = RestClient.post url, {:app=>{:name => "unnamed"}, :token=>token}.to_json, timeout: 1, :content_type => :json, :accept => :json
-      if JSON.parse(response_json)["errors"] && JSON.parse(response_json)["errors"].size > 0
-        puts JSON.parse(response_json)["errors"].map{|x| x["detail"]}.join(".")
-      else
-        name = JSON.parse(response_json)["data"]["attributes"]["name"]
-        puts "Created #{name}, adding git remote"
-        puts "git remote remove meroku"
-        `git remote remove meroku 2>/dev/null`
-        puts "git remote add meroku #{token}@www.meroku.com:#{name}.git"
-        `git remote add meroku #{token}@www.meroku.com:#{name}.git`
+    def logout
+      [
+        "#{Dir.home}/.meroku/.apiusername",
+        "#{Dir.home}/.meroku/.apisecret"
+      ].each do |f|
+        File.delete(f) if File.exist?(f)
       end
+      true
     end
-    def self.token_check
-      if !File.exist? "#{Dir.home}/.meroku/.token"
-        puts "error: Have you logged in yet?"
-        return nil
+    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"
+        )
       end
       true
     end
-    def self.load_secrets
-      if !File.exist? "#{Dir.home}/.meroku/.secret"
-        puts "error: File #{Dir.home}/.meroku/.secret not found"
-        return nil
-      end
-      env_file = Dir.home+'/.meroku/meroku.env'
-      if !File.exist? env_file
-        secret=`cat ~/.meroku/.secret`.chomp
-        remote_env_file = "http://www.sam-we.com/dropbox/meroku-#{secret}/meroku.env"
-        File.write(env_file, Net::HTTP.get(URI.parse(remote_env_file)))
+    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
-      Dotenv.load(env_file)
+      true
     end
-  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