meroku 2.0.8 → 2.0.9

data/lib/meroku/cli/help.rb

@@ -0,0 +1,27 @@
+module Meroku
+  module CLI
+    # The help thats printed when a command is unspecified or unrecognized
+    module Help
+      def help
+        <<~HEREDOC
+          Usage:
+              meroku command subcommand
+
+          Examples:
+            meroku signup    # if you havent done already
+
+            meroku login
+
+            meroku logout
+
+            meroku create
+
+            meroku keys:add
+
+            meroku infrastrucuture spawn    # Spawns server
+
+        HEREDOC
+      end
+    end
+  end
+end

data/lib/meroku/cli/secrets.rb

@@ -0,0 +1,13 @@
+module Meroku
+  module CLI
+    # Logic related to apiusername, apipassword and the env file
+    module Secrets
+      def self.load(admin: false)
+        return unless admin
+        env_file = Dir.home + '/.meroku/meroku.env'
+        abort "error: File not found (#{env_file})" unless File.exist?(env_file)
+        Dotenv.load(env_file)
+      end
+    end
+  end
+end

data/lib/meroku/cli/session.rb

@@ -1,65 +1,46 @@
-
-
 module Meroku
   module CLI
+    # A session is what is created when user executes the meroku command
     class Session
       include Meroku::CLI
-      include Meroku::Infrastructure
-
-      attr_accessor :ec2_client, :token
+      include Meroku::CLI::Help
+
+      def initialize(args)
+        processed = process_user_login_command(args.join(' ')) ||
+                    process_user_other_command(args.join(' ')) ||
+                    process_admin_command(args.join(' '))
+        puts "Unknown command #{args.join(' ')}\n\n#{help}" unless processed
+        exit 1 unless processed
+      end
 
-      def initialize(*args)
-        case args.join(" ")
-        when "signup"
+      def process_user_login_command(arguments)
+        case arguments
+        when /\Asignup/
           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
+        when 'logout'
+          logout
+        when 'login'
+          login
         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
+      def process_user_other_command(arguments)
+        case arguments
+        when 'create'
+          create
+        when 'keys:add'
+          keys_add
+        end
       end
 
+      def process_admin_command(arguments)
+        case arguments
+        when 'infrastructure spawn'
+          spawn
+        when 'infrastructure despawn'
+          despawn
+        end
+      end
     end
   end
 end
-

data/lib/meroku/extensions.rb

@@ -0,0 +1,32 @@
+module Meroku
+  # Has methods that are similar to but extended versions
+  # of core ruby methods
+  module Extensions
+    # Get multipe inputs from user
+    # Masks passwords if detected
+    # Bypasses prompt when ENV variables present
+    def self.mgets(names)
+      names.map do |name|
+        sgets(name)
+      end
+    end
+
+    # single gets
+    def self.sgets(name)
+      print "#{name.to_s.capitalize}: "
+      return env_sgets(name) if ENV['MEROKU_' + name.to_s.upcase]
+      return secure_sgets if name.match?(/password/)
+      STDIN.gets.chomp
+    end
+
+    # get from env variable
+    def self.env_sgets(name)
+      ENV['MEROKU_' + name.to_s.upcase]
+    end
+
+    # secure gets from stdin
+    def self.secure_sgets
+      STDIN.noecho(&:gets).chomp
+    end
+  end
+end

data/lib/meroku/infrastructure.rb

@@ -1,26 +1,23 @@
-require "meroku/infrastructure/node"
+require 'meroku/infrastructure/server'
 
 module Meroku
+  # Logic related to the infratructure that powers meroku
   module Infrastructure
+    extend Meroku::Aws::Ec2
 
-    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)}"
+    def self.servers
+      ec2_client.describe_instances(
+        filters: [
+          { name: 'tag:Name', values: ['node'] },
+          { name: 'instance-state-name', values: %w[running pending] }
+        ]
+      ).reservations.map do |xx|
+        Meroku::Infrastructure::Server.new(xx.instances.first.instance_id)
+      end
     end
 
-    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
+    def self.each_server
+      servers.each { |s| yield s }
     end
-
-
   end
-
 end

data/lib/meroku/infrastructure/server.rb

@@ -0,0 +1,20 @@
+module Meroku
+  module Infrastructure
+    # A server hosts the api (called during signup, login, etc)
+    # and atm also hosts end users applications
+    class Server
+      include Meroku::Aws::Ec2
+
+      attr_reader :instance_id
+
+      def initialize(instance_id)
+        @instance_id = instance_id
+      end
+
+      def shutdown
+        puts "Will terminate #{@instance_id}"
+        ec2_client.terminate_instances(instance_ids: [@instance_id])
+      end
+    end
+  end
+end

data/lib/meroku/node.rb

@@ -0,0 +1,113 @@
+module Meroku
+  # At the moment we run on one ec2 node
+  # This class represents that node
+  class Node
+    include Meroku::Aws::Ec2
+    include Meroku::Tunnelable
+
+    def initialize
+      puts "run_instances()"
+      @instance = make_instance
+      @tunnel_ip = Meroku::Aws::IP
+      @tunnel_username = "ubuntu"
+      @tunnel_password = "password"
+      @tunnel_key_name = Meroku::Aws::KEY_NAME
+      print "sleep "
+      30.times { print sleep(1) }
+      print "\n"
+    end
+
+    def associate_address
+      ip = "eipalloc-139f7823"
+      Meroku::Aws::Ec2.associate_address(ip, @instance.instance_id)
+      self
+    end
+
+    def configure_keys
+      str = <<~HEREDOC
+        mkdir /home/ubuntu/.meroku
+        sudo curl -s -o /etc/ssh/ssh_host_ecdsa_key #{Meroku::Aws.bucket_url}/ssh_host_ecdsa_key
+        sudo curl -s -o /etc/ssh/ssh_host_ecdsa_key.pub #{Meroku::Aws.bucket_url}/ssh_host_ecdsa_key.pub
+        curl -s -o /home/ubuntu/.meroku/letsencrypt_fullchain.pem #{Meroku::Aws.bucket_url}/letsencrypt_fullchain.pem
+        curl -s -o /home/ubuntu/.meroku/letsencrypt_privkey.pem #{Meroku::Aws.bucket_url}/letsencrypt_privkey.pem
+        curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def add_sources
+      str = <<~HEREDOC
+        echo "Dpkg::Use-Pty "0";" | sudo tee /etc/apt/apt.conf.d/00usepty
+        sudo apt-add-repository ppa:brightbox/ruby-ng --yes 2>/dev/null >/dev/null
+        echo "deb http://archive.ubuntu.com/ubuntu/ trusty main universe" | sudo tee -a /etc/apt/sources.list
+        echo "deb http://archive.ubuntu.com/ubuntu/ trusty-security main universe" | sudo tee -a /etc/apt/sources.list
+        echo "deb http://archive.ubuntu.com/ubuntu/ trusty-updates main universe" | sudo tee -a /etc/apt/sources.list
+        echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | sudo tee -a /etc/apt/sources.list
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def ubuntu_updates
+      str = <<~HEREDOC
+        DEBIAN_FRONTEND=noninteractive sudo apt-get update -qq
+        DEBIAN_FRONTEND=noninteractive sudo apt-get upgrade -yqq --force-yes 2>/dev/null >/dev/null
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def install_packages
+      str = <<~HEREDOC
+        DEBIAN_PRIORITY=critical DEBIAN_FRONTEND=noninteractive sudo apt-get install -q -y -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" autoconf bind9-host bison build-essential coreutils curl daemontools dnsutils ed git imagemagick iputils-tracepath language-pack-en libbz2-dev libcurl4-openssl-dev libev-dev libevent-dev libglib2.0-dev libjpeg-dev libmagickwand-dev libmysqlclient-dev libncurses5-dev librdkafka-dev libreadline6-dev libssl-dev libuv-dev libxml2-dev libxslt-dev netcat-openbsd openjdk-7-jdk openjdk-7-jre-headless openssh-client openssh-server python python-dev socat stunnel syslinux tar telnet zip zlib1g-dev ruby2.4 ruby2.4-dev nginx libsqlite3-dev nodejs libpq-dev postgresql-9.6 2>/dev/null >/dev/null
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def database_inits
+      str = <<~HEREDOC
+        sudo -u postgres createuser -e meroku
+        sudo -u postgres createdb meroku
+        sudo -u postgres psql -c "ALTER ROLE meroku WITH PASSWORD '#{ENV['SECRET']}';"
+        sudo perl -pi -e "s#local.*all.*all.*peer#local   all             all                                     md5#" /etc/postgresql/9.6/main/pg_hba.conf
+        sudo service postgresql restart
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def git_clone
+      str = <<~HEREDOC
+        cd ~; git clone https://github.com/oystersauce8/meroku;
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def nginx_configs
+      str = <<~HEREDOC
+        sudo rm -f /etc/nginx/sites-enabled/* /etc/nginx/sites-available/*
+        sudo cp ~/meroku/frontend/etc_nginx_sites-enabled_default /etc/nginx/sites-enabled/default
+        sudo mkdir /sharedro && sudo chmod 777 /sharedro
+        sudo cp /home/ubuntu/meroku/frontend/etc_nginx_sites-enabled_template /sharedro
+        sudo chmod a+r /sharedro/etc_nginx_sites-enabled_template
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+
+    def start_rails
+      str = <<~HEREDOC
+        cd ~/meroku/frontend; sudo gem install bundler; bundle;
+        cd ~/meroku/frontend; SECRET=#{ENV['SECRET']} RAILS_ENV=production bundle exec rails assets:precompile
+        cd ~/meroku/frontend; SECRET=#{ENV['SECRET']} RAILS_ENV=production bundle exec rake db:migrate
+        cd ~/meroku/frontend; SECRET=#{ENV['SECRET']} bundle exec puma -d -b unix:///home/ubuntu/meroku.sock
+        sudo /usr/sbin/nginx -s reload
+      HEREDOC
+      str.split("\n").each { |cmd| tunnel_run(cmd) }
+      self
+    end
+  end
+end

data/lib/meroku/tunnelable.rb

@@ -0,0 +1,31 @@
+module Meroku
+  # Gives object the ability to execute bash commands on itself via ssh
+  module Tunnelable
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def tunnel_run(cmd)
+      retries = 0
+      begin
+        code = nil
+        Net::SSH.start(@tunnel_ip,
+                       @tunnel_username,
+                       keys: @tunnel_key_name,
+                       verify_host_key: false) do |ssh|
+          ssh.open_channel do |channel|
+            puts cmd
+            channel.exec cmd do |ch, success|
+              raise "could not execute command" unless success
+              ch.on_data { |_c, data| print data }
+              ch.on_extended_data { |_c, _type, data| print data }
+              ch.on_request("exit-status") { |_ch, data| code = data.read_long }
+            end
+          end.wait
+        end
+        abort "#{cmd} returned #{code} !!" if code != 0
+      rescue Net::SSH::ConnectionTimeout
+        puts "Net::SSH::ConnectionTimeout" && retry if (retries += 1) < 3
+      rescue Errno::ECONNREFUSED
+        puts "Net::SSH::ConnectionTimeout" && retry if (retries += 1) < 3
+      end
+    end
+  end
+end

data/lib/meroku/version.rb

@@ -1,3 +1,3 @@
 module Meroku
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/modified-cedar-14.sh

@@ -106,8 +106,6 @@ apt-get install -y --force-yes \
     libmagickwand-dev \
     libmysqlclient-dev \
     libncurses5-dev \
-    libpq-dev \
-    libpq5 \
     librdkafka-dev \
     libreadline6-dev \
     libssl-dev \
@@ -119,8 +117,6 @@ apt-get install -y --force-yes \
     openjdk-7-jre-headless \
     openssh-client \
     openssh-server \
-    postgresql-client-9.6 \
-    postgresql-server-dev-9.6 \
     python \
     python-dev \
     socat \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meroku
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Sam Weerasinghe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -242,6 +242,7 @@ files:
 - bin/console
 - bin/meroku
 - bin/setup
+- circle.yml
 - exe/meroku
 - frontend/.gitignore
 - frontend/.ruby-version
@@ -267,7 +268,6 @@ files:
 - frontend/app/controllers/application_controller.rb
 - frontend/app/controllers/apps_controller.rb
 - frontend/app/controllers/concerns/.keep
-- frontend/app/controllers/pages_controller.rb
 - frontend/app/controllers/publickeys_controller.rb
 - frontend/app/controllers/users/confirmations_controller.rb
 - frontend/app/controllers/users/omniauth_callbacks_controller.rb
@@ -280,12 +280,15 @@ files:
 - frontend/app/helpers/pages_helper.rb
 - frontend/app/helpers/publickeys_helper.rb
 - frontend/app/jobs/application_job.rb
+- frontend/app/lib/cmd.rb
 - frontend/app/mailers/application_mailer.rb
 - frontend/app/models/app.rb
 - frontend/app/models/application_record.rb
 - frontend/app/models/concerns/.keep
 - frontend/app/models/publickey.rb
 - frontend/app/models/user.rb
+- frontend/app/policies/application_policy.rb
+- frontend/app/policies/publickey_policy.rb
 - frontend/app/serializable/serializable_app.rb
 - frontend/app/serializable/serializable_publickey.rb
 - frontend/app/serializable/serializable_user.rb
@@ -315,7 +318,6 @@ files:
 - frontend/app/views/layouts/application.html.erb
 - frontend/app/views/layouts/mailer.html.erb
 - frontend/app/views/layouts/mailer.text.erb
-- frontend/app/views/pages/landing.html.erb
 - frontend/app/views/publickeys/_form.html.erb
 - frontend/app/views/publickeys/_publickey.json.jbuilder
 - frontend/app/views/publickeys/edit.html.erb
@@ -357,10 +359,10 @@ files:
 - frontend/config/secrets.yml
 - frontend/config/spring.rb
 - frontend/db/migrate/20171023223732_devise_create_users.rb
-- frontend/db/migrate/20171025193627_add_token_to_users.rb
 - frontend/db/migrate/20171025203706_create_apps.rb
 - frontend/db/migrate/20171025223804_add_user_to_apps.rb
 - frontend/db/migrate/20171026071440_create_publickeys.rb
+- frontend/db/migrate/20171028150506_add_apisecret_to_users.rb
 - frontend/db/schema.rb
 - frontend/db/seeds.rb
 - frontend/etc_nginx_sites-enabled_default
@@ -372,10 +374,42 @@ files:
 - frontend/public/404.html
 - frontend/public/422.html
 - frontend/public/500.html
+- frontend/public/Meroku.html
+- frontend/public/Meroku/Api.html
+- frontend/public/Meroku/Api/Request.html
+- frontend/public/Meroku/Aws.html
+- frontend/public/Meroku/Aws/Ec2.html
+- frontend/public/Meroku/CLI.html
+- frontend/public/Meroku/CLI/AdminUser.html
+- frontend/public/Meroku/CLI/Help.html
+- frontend/public/Meroku/CLI/Secrets.html
+- frontend/public/Meroku/CLI/Session.html
+- frontend/public/Meroku/CLI/User.html
+- frontend/public/Meroku/Extensions.html
+- frontend/public/Meroku/Infrastructure.html
+- frontend/public/Meroku/Infrastructure/Node.html
+- frontend/public/Meroku/Infrastructure/Server.html
+- frontend/public/Meroku/Node.html
+- frontend/public/Meroku/Tunnel.html
+- frontend/public/Meroku/Tunnelable.html
+- frontend/public/_index.html
 - frontend/public/apple-touch-icon-precomposed.png
 - frontend/public/apple-touch-icon.png
+- frontend/public/class_list.html
+- frontend/public/css/common.css
+- frontend/public/css/full_list.css
+- frontend/public/css/style.css
 - frontend/public/favicon.ico
+- frontend/public/file.README.html
+- frontend/public/file_list.html
+- frontend/public/frames.html
+- frontend/public/index.html
+- frontend/public/js/app.js
+- frontend/public/js/full_list.js
+- frontend/public/js/jquery.js
+- frontend/public/method_list.html
 - frontend/public/robots.txt
+- frontend/public/top-level-namespace.html
 - frontend/test/application_system_test_case.rb
 - frontend/test/controllers/.keep
 - frontend/test/controllers/apps_controller_test.rb
@@ -393,6 +427,7 @@ files:
 - frontend/test/models/app_test.rb
 - frontend/test/models/publickey_test.rb
 - frontend/test/models/user_test.rb
+- frontend/test/policies/publickey_policy_test.rb
 - frontend/test/system/.keep
 - frontend/test/system/apps_test.rb
 - frontend/test/system/publickeys_test.rb
@@ -400,13 +435,19 @@ files:
 - frontend/tmp/.keep
 - frontend/vendor/.keep
 - lib/meroku.rb
+- lib/meroku/api.rb
+- lib/meroku/api/request.rb
+- lib/meroku/aws.rb
+- lib/meroku/aws/ec2.rb
 - lib/meroku/cli.rb
-- lib/meroku/cli/admin_user.rb
+- lib/meroku/cli/help.rb
+- lib/meroku/cli/secrets.rb
 - lib/meroku/cli/session.rb
-- lib/meroku/cli/user.rb
+- lib/meroku/extensions.rb
 - lib/meroku/infrastructure.rb
-- lib/meroku/infrastructure/node.rb
-- lib/meroku/tunnel.rb
+- lib/meroku/infrastructure/server.rb
+- lib/meroku/node.rb
+- lib/meroku/tunnelable.rb
 - lib/meroku/version.rb
 - meroku.gemspec
 - modified-cedar-14.sh