meroku 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74fd11997f53c773598e76575486b10572ce0acc
-  data.tar.gz: 901942c1d9a97b7095c26a6bda871661c6781ee5
+  metadata.gz: 1f5b77a7020b9070c98356c545c6bad3c10cb41f
+  data.tar.gz: 245195d10ba32e577c050181618cabe13a9a3994
 SHA512:
-  metadata.gz: def75bd1beabc9fd05db76c4dd75bce0bcb6422b844ce38887287b4ce25a4e79958ba5f59d8df04aba7c5fca59d8b341e2ab6eee597a83fb2ffa1f710d08797d
-  data.tar.gz: 72d8f5f166cb5c546cf5c9da204a4578a382709d9f4da0d08692fb066c1bf1717f8db3ad660dd70f81d7f776ea0625b8673139b9b62a77f3d4dc4826164b5e87
+  metadata.gz: 4d9f6674d08add9d0fc57b5b9d8246c7797dfe622b9cf5cbbca2da3b08e95e48dc0410e994c6cc5364cad45c87d5cbf9db37c7f5db5c3cda6f81e7a7cb94cc7b
+  data.tar.gz: 9269502bb855e2cc21526a177bd25832ad1ae83334b65a0699a1092d05ad7cc2baaaed0be6d127cb0bd96f34acc044285e25304d4a987e72f82d6eca188fdafb

data/bin/meroku

@@ -3,4 +3,4 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'meroku'
 
-Meroku::CLI.start(*ARGV)
+Meroku::CLI::Session.new(*ARGV)

data/frontend/app/controllers/publickeys_controller.rb

@@ -32,6 +32,7 @@ class PublickeysController < ApplicationController
         title: 'Invalid Authorization Token',
         detail: 'Invalid token. Try logging in again.'
       }]) and return
+    end
 
     respond_to do |format|
       if @publickey.save

data/frontend/app/models/publickey.rb

@@ -1,3 +1,14 @@
 class Publickey < ApplicationRecord
   belongs_to :user
+
+  # Updates /home/git/.ssh/authorized_keys
+  # called when something added/?/etc to publickeys table 
+  def self.refresh
+    Rails.logger.debug "DB8 publickey.rb:def self.refresh called"
+    Rails.logger.debug "wipwip"
+  end
+
+  def after_save
+    Publickey.refresh
+  end
 end

data/lib/meroku.rb

@@ -8,9 +8,11 @@ require "byebug"
 require 'rest-client'
 require "meroku/version"
 require "meroku/tunnel"
-require "meroku/cli"
-require "meroku/aws"
+require "meroku/cli/user"
+require "meroku/cli/admin_user"
 require "meroku/infrastructure"
+require "meroku/cli"
+
 
 module Meroku
 

data/lib/meroku/cli.rb

@@ -1,7 +1,10 @@
+require "meroku/cli/session"
+
 module Meroku
   module CLI
 
-    HELP = <<~HEREDOC
+    def help
+      <<~HEREDOC
       Usage: meroku command subcommand
   
       Examples
@@ -14,38 +17,38 @@ module Meroku
 
       meroku infrastrucuture spawn    # Spawns server      
   
-    HEREDOC
-    
-    def self.start(*args)
-      case args.join(" ")
-        when "infrastructure spawn"
-          load_secrets || exit
-          node = Meroku::Infrastructure::Node.new.associate_address.install_packages.install_frontend_app
-          puts "spawned #{node.instance.try(:instance_id)}"
-        when "infrastructure despawn"
-          load_secrets || exit
-          Meroku::Infrastructure.despawn
-        when "signup"
-          signup
-        when "keys:add"
-          token_check || exit
-          keys_add
-        when "create"
-          token_check || exit
-          create
-        else
-          puts HELP
-      end      
+      HEREDOC
     end
-
-    def self.signup
+    
+    #def self.start(*args)
+    #  case args.join(" ")
+    #    when "infrastructure spawn"
+    #      load_secrets || exit
+    #      node = Meroku::Infrastructure::Node.new.associate_address.install_packages.install_frontend_app
+    #      puts "spawned #{node.instance.try(:instance_id)}"
+    #    when "infrastructure despawn"
+    #      load_secrets || exit
+    #      Meroku::Infrastructure.despawn
+    #    when "signup"
+    #      signup
+    #    when "keys:add"
+    #      token_check || exit
+    #      keys_add
+    #    when "create"
+    #      token_check || exit
+    #      create
+    #    else
+    #      puts HELP
+    #  end      
+    #end
+
+    def signup
       print "Email: "
       email = STDIN.gets
       print "Password: "
       password = STDIN.noecho(&:gets).chomp
       print "\n"
       url = "https://www.meroku.com/users.json"
-      #url = "http://localhost:3000/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 JSON.parse(response_json)["errors"].map{|x| x["detail"]}.join(".")
@@ -53,11 +56,33 @@ module Meroku
         email = JSON.parse(response_json)["data"]["attributes"]["email"]
         token = JSON.parse(response_json)["data"]["attributes"]["token"]
         puts "Signed up #{email}"
-        save_token(token)
+        dirname = File.dirname("#{Dir.home}/.meroku")
+        FileUtils.mkdir(dirname) if !File.directory?(dirname)
+        File.open("#{Dir.home}/.meroku/.token", 'w') { |file| file.write(token) }
       end
     end
 
-    def self.create
+    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 JSON.parse(response_json)["errors"].map{|x| x["detail"]}.join(".")
+      else
+        name = JSON.parse(response_json)["data"]["attributes"]["name"]
+        puts "Added #{name}"
+      end
+    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
@@ -96,34 +121,28 @@ module Meroku
       Dotenv.load(env_file)
     end
 
-    def self.save_token(token)
-      dirname = File.dirname("#{Dir.home}/.meroku")
-      unless File.directory?(dirname)
-        FileUtils.mkdir(dirname)
-      end
-      File.open("#{Dir.home}/.meroku/.token", 'w') { |file| file.write(token) }
-    end
 
-    def self.keys_add
-      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"
-      token = `cat ~/.meroku/.token`.chomp
-      response_json = RestClient.post url, {:publickey=>{:name => name, :data=>data}, :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 "Added #{name}"
-      end
-    end
+    #def self.keys_add
+    #  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"
+    #  token = `cat ~/.meroku/.token`.chomp
+    #  response_json = RestClient.post url, {:publickey=>{:name => name, :data=>data}, :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 "Added #{name}"
+    #  end
+    #end
 
   end
 

data/lib/meroku/cli/admin_user.rb

@@ -0,0 +1,20 @@
+module Meroku
+  module CLI
+    
+    module AdminUser
+    
+      def self.load_secrets(obj)
+        env_file = Dir.home+'/.meroku/meroku.env'
+        if !File.exist?(env_file)
+          puts "error: File not found (#{Dir.home}/.meroku/meroku.env)"
+          return nil
+        end
+        Dotenv.load(env_file)
+        obj.ec2_client = ::Aws::EC2::Client.new(
+          region: 'us-east-1',
+          credentials: ::Aws::Credentials.new(ENV['AWS_ACCESS_KEY'], ENV['AWS_SECRET'])
+        )
+      end
+    end
+  end
+end

data/lib/meroku/cli/session.rb

@@ -0,0 +1,65 @@
+
+
+module Meroku
+  module CLI
+    class Session
+      include Meroku::CLI
+      include Meroku::Infrastructure
+
+      attr_accessor :ec2_client, :token
+
+      def initialize(*args)
+        case args.join(" ")
+        when "signup"
+          signup
+        when "create"
+          Meroku::CLI::User.load_secrets(self) || exit
+          create
+        when "keys:add"
+          Meroku::CLI::User.load_secrets(self) || exit
+          keys_add(self)
+        when "infrastructure spawn"
+          Meroku::CLI::AdminUser.load_secrets(self) || exit
+          spawn(self)
+        when "infrastructure despawn"
+          Meroku::CLI::AdminUser.load_secrets(self) || exit
+          despawn
+        else
+          puts "Unknown command #{args.join(" ")}\n\n"
+          puts help
+        end
+
+
+        #case args.join(" ")
+        #  when "infrastructure spawn"
+        #    load_secrets || exit
+        #    node = Meroku::Infrastructure::Node.new.associate_address.install_packages.install_frontend_app
+        #    puts "spawned #{node.instance.try(:instance_id)}"
+        #  when "infrastructure despawn"
+        #    load_secrets || exit
+        #    Meroku::Infrastructure.despawn
+        #  when "signup"
+        #    signup
+        #  when "keys:add"
+        #    token_check || exit
+        #    keys_add
+        #  when "create"
+        #    token_check || exit
+        #    create
+        #  else
+        #    puts HELP
+        #end      
+      end
+
+      def ec2_client
+        @ec2_client ||= ::Aws::EC2::Client.new(
+          region: 'us-east-1',
+          credentials: ::Aws::Credentials.new(ENV['AWS_ACCESS_KEY'], ENV['AWS_SECRET'])
+        )
+        @ec2_client
+      end
+
+    end
+  end
+end
+

data/lib/meroku/cli/user.rb

@@ -0,0 +1,14 @@
+module Meroku
+  module CLI
+    module User
+      def self.load_secrets(obj)
+      if !File.exist? "#{Dir.home}/.meroku/.token"
+        puts "error: Have you logged in yet?"
+        return nil
+      end
+        obj.token = `cat ~/.meroku/.token`.chomp
+      end
+
+    end
+  end
+end

data/lib/meroku/infrastructure.rb

@@ -3,15 +3,24 @@ require "meroku/infrastructure/node"
 module Meroku
   module Infrastructure
 
-    extend Meroku::Aws
+    def spawn(session)
+      node = Meroku::Infrastructure::Node.new(session.ec2_client)
+      node.associate_address
+      node.install_packages
+      node.tweak_configuration
+      node.install_frontend_app
+      puts "spawned #{node.instance.try(:instance_id)}"
+    end
 
-    def self.despawn
+    def despawn
       instances = ec2_client.describe_instances(filters:[{ name: "tag:Name", values: ['node'] }, { name: 'instance-state-name', values: ['running','pending'] }]).reservations.map { |xx| xx.instances.first.instance_id }
       puts "will despawn #{instances.inspect}"
       ec2_client.terminate_instances({
                                        instance_ids: instances
                                      }) if instances.size > 0
     end
+
+
   end
 
 end

data/lib/meroku/infrastructure/node.rb

@@ -2,11 +2,31 @@
 module Meroku
   module Infrastructure
     class Node
-      include Meroku::Aws
-      attr_accessor :instance, :tunnel
+      attr_accessor :instance, :tunnel, :ec2_client
 
-      def initialize
-        result = ec2_client.try(:run_instances,Meroku::Aws::EC2_PARAMS)
+      def initialize(ec2_client)
+        @ec2_client = ec2_client
+        result = ec2_client.try(
+          :run_instances,
+          {
+            image_id: 'ami-841f46ff',  #was xenial 'ami-cd0f5cb6',
+            min_count: 1,
+            max_count: 1,
+            key_name: 'meroku.id_rsa',
+            instance_type: 't2.micro',
+            tag_specifications: [
+              {
+                resource_type: "instance",
+                tags: [
+                  {
+                    key: "Name",
+                    value: "node",
+                  },
+                ],
+              },
+            ]
+          }
+        )
         @instance = result.instances.first if result
         @tunnel = Meroku::Tunnel.new(
           ip: "34.239.241.218",
@@ -20,8 +40,7 @@ module Meroku
 
       def associate_address
         retries ||= 0
-        return self if !ec2_client
-        ec2_client.associate_address(
+        @ec2_client.associate_address(
           allocation_id: "eipalloc-139f7823",
           instance_id: @instance.try(:instance_id)
         )
@@ -43,6 +62,12 @@ module Meroku
         self
       end
 
+      def tweak_configuration
+        @tunnel.run 'sudo adduser --disabled-password --gecos "" git'
+        @tunnel.run 'sudo -u git mkdir /home/git/.ssh/'
+        @tunnel.run 'sudo -u git touch /home/git/.ssh/authorized_keys'
+      end
+      
       def install_frontend_app
         @tunnel.run 'mkdir /home/ubuntu/.meroku'
         @tunnel.run "cd ~\; git clone https://github.com/oystersauce8/meroku\;"

data/lib/meroku/version.rb

@@ -1,3 +1,3 @@
 module Meroku
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meroku
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Sam Weerasinghe
@@ -399,8 +399,10 @@ files:
 - frontend/tmp/.keep
 - frontend/vendor/.keep
 - lib/meroku.rb
-- lib/meroku/aws.rb
 - lib/meroku/cli.rb
+- lib/meroku/cli/admin_user.rb
+- lib/meroku/cli/session.rb
+- lib/meroku/cli/user.rb
 - lib/meroku/infrastructure.rb
 - lib/meroku/infrastructure/node.rb
 - lib/meroku/tunnel.rb

data/lib/meroku/aws.rb

@@ -1,32 +0,0 @@
-module Meroku
-  module Aws
-
-    EC2_PARAMS = {
-      image_id: 'ami-841f46ff',  #was xenial 'ami-cd0f5cb6',
-      min_count: 1,
-      max_count: 1,
-      key_name: 'meroku.id_rsa',
-      instance_type: 't2.micro',
-      tag_specifications: [
-        {
-          resource_type: "instance",
-          tags: [
-            {
-              key: "Name",
-              value: "node",
-            },
-          ],
-        },
-      ]
-    }
-
-    def credentials
-      ::Aws::Credentials.new(ENV['AWS_ACCESS_KEY'], ENV['AWS_SECRET'])
-    end
-
-    def ec2_client
-      ::Aws::EC2::Client.new(region: 'us-east-1', credentials: credentials)
-    end
-
-  end
-end