meroku 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2ff13db62d348c38f0c5e092867906f34b4ea2
-  data.tar.gz: 86bdb03ea56d8c3f2e870dd26606eb7477829535
+  metadata.gz: ad5f5ca79ce1ebc9536a34a7914167cbe0b09838
+  data.tar.gz: 2aa86958df6a7fb04e8664fdb6c3235b6cd4dff6
 SHA512:
-  metadata.gz: 73baef2c048146816a658c9a6dbac5bf9e28f3827a685ac246f41bef2f4ac7e75f902cad6e08a0be96b977d436d8bc4acec403f989ee8715712cc1a719016243
-  data.tar.gz: 01156426d89e2cff0ef734707b17bf92982dc98644f88cb0990061394390c7b0a1c591b78f7177e672aa67ebf342c49dd02ca82920a1d5b317615b261fd9d2a8
+  metadata.gz: 9dcbd1a4a80ff721be16c9aa265067fe6167e7f08213df4bde6171e02074a7d1a9ef40e7b3751abbc7541e938ad2b9225a43dae2bd42024901648be44770c7cf
+  data.tar.gz: 00cffa6fe619cc4e0530690ad2043cb1f44c9673eed29ce7be03802fa21987d702072b45b2db20f5f6ee989cf9dc4d2656d3ee73d3ba786a5ed693cc0cc927c3

data/README.md

@@ -79,7 +79,14 @@ You will need a copy of the file `.secret`. Place it at `~/.meroku/.secret`
 ### Commands
 
     $ meroku infrastructure spawn
+    $ meroku infrastructure despawn
 
+    $ rubocop -D -F --except FrozenStringLiteralComment,StringLiterals,MutableConstant lib/
+    Inspecting 15 files
+    ...............
+    
+    15 files inspected, no offenses detected
+    $ 
 
 ### TODO
 
@@ -88,11 +95,8 @@ You will need a copy of the file `.secret`. Place it at `~/.meroku/.secret`
     - Only RAILS_ENV=procution is supported at the moment
     - Only puma is supported at the moment
 
-    - Database
-    - User security / Lxc
-    - Nightly spawn
-
-    - respons time sanity check
+    - Nightly spawn    
+    - respons time sanity check and full-lifecycle topics
     - piper visual check
     - some commodity apps
 

data/bin/meroku

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

data/circle.yml

@@ -0,0 +1,23 @@
+general:
+  branches:
+    only:
+      - notmaster
+
+machine:
+
+  timezone:
+    America/Los_Angeles # Set the timezone
+
+dependencies:
+  override:
+    - echo
+
+database:
+  override:
+    - echo
+
+test:
+  override:
+    - ruby --version
+    - gem install meroku
+

data/frontend/Gemfile

@@ -9,7 +9,7 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.4'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+#gem 'sqlite3'
 # Use Puma as the app server
 gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets
@@ -35,7 +35,7 @@ gem 'jbuilder', '~> 2.5'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  #gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '~> 2.13'
   gem 'selenium-webdriver'
@@ -56,3 +56,6 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'devise'
 gem 'jsonapi-rails'
 gem "active_model_serializers"
+gem "pg"
+gem "byebug"
+gem "pundit"

data/frontend/Gemfile.lock

@@ -118,8 +118,11 @@ GEM
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
+    pg (0.21.0)
     public_suffix (3.0.0)
     puma (3.10.0)
+    pundit (1.1.0)
+      activesupport (>= 3.0.0)
     rack (2.0.3)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
@@ -181,7 +184,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
@@ -217,13 +219,14 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jsonapi-rails
   listen (>= 3.0.5, < 3.2)
+  pg
   puma (~> 3.7)
+  pundit
   rails (~> 5.1.4)
   sass-rails (~> 5.0)
   selenium-webdriver
   spring
   spring-watcher-listen (~> 2.0.0)
-  sqlite3
   turbolinks (~> 5)
   tzinfo-data
   uglifier (>= 1.3.0)

data/frontend/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
+  include Pundit
   protect_from_forgery with: :exception
 end

data/frontend/app/controllers/apps_controller.rb

@@ -2,44 +2,42 @@ class AppsController < ApplicationController
   before_action :set_app, only: [:show, :edit, :update, :destroy]
   skip_before_action :verify_authenticity_token, only: [:create]
 
-  # GET /apps
-  # GET /apps.json
-  def index
-    @apps = App.all
-  end
-
-  # GET /apps/1
-  # GET /apps/1.json
-  def show
-  end
-
-  # GET /apps/new
-  def new
-    @app = App.new
-  end
-
-  # GET /apps/1/edit
-  def edit
-  end
+  ## GET /apps
+  ## GET /apps.json
+  #def index
+  #  @apps = App.all
+  #end
+  #
+  ## GET /apps/1
+  ## GET /apps/1.json
+  #def show
+  #end
+  #
+  ## GET /apps/new
+  #def new
+  #  @app = App.new
+  #end
+  #
+  ## GET /apps/1/edit
+  #def edit
+  #end
 
   # POST /apps
   # POST /apps.json
   def create
     @app = App.new(app_params)
-    @app.name = SecureRandom.hex
-    @app.user = User.find_by_token(params[:token])
+    @app.name = "app#{SecureRandom.hex[0..6]}"
+    @app.user = User.find_by_apisecret(params[:apisecret])
     if !@app.user
       (render :jsonapi_errors => [{ 
-        title: 'Invalid Authorization Token',
-        detail: 'Invalid token. Try logging in again.'
+        title: 'Authentication failed',
+        detail: 'Authentication failed'
       }]) and return
-
     end
 
     respond_to do |format|
       if @app.save
         format.html { redirect_to @app, notice: 'App was successfully created.' }
-        #format.json { render :show, status: :created, location: @app }
         format.json { render jsonapi: @app }
       else
         format.html { render :new }
@@ -48,29 +46,29 @@ class AppsController < ApplicationController
     end
   end
 
-  # PATCH/PUT /apps/1
-  # PATCH/PUT /apps/1.json
-  def update
-    respond_to do |format|
-      if @app.update(app_params)
-        format.html { redirect_to @app, notice: 'App was successfully updated.' }
-        format.json { render :show, status: :ok, location: @app }
-      else
-        format.html { render :edit }
-        format.json { render json: @app.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /apps/1
-  # DELETE /apps/1.json
-  def destroy
-    @app.destroy
-    respond_to do |format|
-      format.html { redirect_to apps_url, notice: 'App was successfully destroyed.' }
-      format.json { head :no_content }
-    end
-  end
+  ## PATCH/PUT /apps/1
+  ## PATCH/PUT /apps/1.json
+  #def update
+  #  respond_to do |format|
+  #    if @app.update(app_params)
+  #      format.html { redirect_to @app, notice: 'App was successfully updated.' }
+  #      format.json { render :show, status: :ok, location: @app }
+  #    else
+  #      format.html { render :edit }
+  #      format.json { render json: @app.errors, status: :unprocessable_entity }
+  #    end
+  #  end
+  #end
+  #
+  ## DELETE /apps/1
+  ## DELETE /apps/1.json
+  #def destroy
+  #  @app.destroy
+  #  respond_to do |format|
+  #    format.html { redirect_to apps_url, notice: 'App was successfully destroyed.' }
+  #    format.json { head :no_content }
+  #  end
+  #end
 
   private
     # Use callbacks to share common setup or constraints between actions.

data/frontend/app/controllers/publickeys_controller.rb

@@ -2,42 +2,41 @@ class PublickeysController < ApplicationController
   before_action :set_publickey, only: [:show, :edit, :update, :destroy]
   skip_before_action :verify_authenticity_token, only: [:create]
 
-  # GET /publickeys
-  # GET /publickeys.json
-  def index
-    @publickeys = Publickey.all
-  end
-
-  # GET /publickeys/1
-  # GET /publickeys/1.json
-  def show
-  end
-
-  # GET /publickeys/new
-  def new
-    @publickey = Publickey.new
-  end
-
-  # GET /publickeys/1/edit
-  def edit
-  end
+  ## GET /publickeys
+  ## GET /publickeys.json
+  #def index
+  #  @publickeys = Publickey.all
+  #end
+  #
+  ## GET /publickeys/1
+  ## GET /publickeys/1.json
+  #def show
+  #end
+  #
+  ## GET /publickeys/new
+  #def new
+  #  @publickey = Publickey.new
+  #end
+  #
+  ## GET /publickeys/1/edit
+  #def edit
+  #end
 
   # POST /publickeys
   # POST /publickeys.json
   def create
     @publickey = Publickey.new(publickey_params)
-    @publickey.user = User.find_by_token(params[:token])
+    @publickey.user = User.find_by_apisecret(params[:apisecret])
     if !@publickey.user
       (render :jsonapi_errors => [{ 
-        title: 'Invalid Authorization Token',
-        detail: 'Invalid token. Try logging in again.'
+        title: 'Authentiction failed',
+        detail: 'Invalid Authentication failed. Try logging in again.'
       }]) and return
     end
 
     respond_to do |format|
       if @publickey.save
         format.html { redirect_to @publickey, notice: 'Publickey was successfully created.' }
-        #format.json { render :show, status: :created, location: @publickey }
         format.json { render jsonapi: @publickey }
       else
         format.html { render :new }
@@ -46,29 +45,29 @@ class PublickeysController < ApplicationController
     end
   end
 
-  # PATCH/PUT /publickeys/1
-  # PATCH/PUT /publickeys/1.json
-  def update
-    respond_to do |format|
-      if @publickey.update(publickey_params)
-        format.html { redirect_to @publickey, notice: 'Publickey was successfully updated.' }
-        format.json { render :show, status: :ok, location: @publickey }
-      else
-        format.html { render :edit }
-        format.json { render json: @publickey.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /publickeys/1
-  # DELETE /publickeys/1.json
-  def destroy
-    @publickey.destroy
-    respond_to do |format|
-      format.html { redirect_to publickeys_url, notice: 'Publickey was successfully destroyed.' }
-      format.json { head :no_content }
-    end
-  end
+  ## PATCH/PUT /publickeys/1
+  ## PATCH/PUT /publickeys/1.json
+  #def update
+  #  respond_to do |format|
+  #    if @publickey.update(publickey_params)
+  #      format.html { redirect_to @publickey, notice: 'Publickey was successfully updated.' }
+  #      format.json { render :show, status: :ok, location: @publickey }
+  #    else
+  #      format.html { render :edit }
+  #      format.json { render json: @publickey.errors, status: :unprocessable_entity }
+  #    end
+  #  end
+  #end
+  #
+  ## DELETE /publickeys/1
+  ## DELETE /publickeys/1.json
+  #def destroy
+  #  @publickey.destroy
+  #  respond_to do |format|
+  #    format.html { redirect_to publickeys_url, notice: 'Publickey was successfully destroyed.' }
+  #    format.json { head :no_content }
+  #  end
+  #end
 
   private
     # Use callbacks to share common setup or constraints between actions.

data/frontend/app/controllers/users/registrations_controller.rb

@@ -13,31 +13,16 @@ class Users::RegistrationsController < Devise::RegistrationsController
 
   # POST /resource
   def create
-    #super
     build_resource(sign_up_params)
 
     resource.save
     yield resource if block_given?
     if resource.persisted?
-      #render jsonapi: resource
       render jsonapi: resource
-      #if resource.active_for_authentication?
-      #  set_flash_message! :notice, :signed_up
-      #  sign_up(resource_name, resource)
-      #  respond_with resource, location: after_sign_up_path_for(resource)
-      #else
-      #  set_flash_message! :notice, :"signed_up_but_#{resource.inactive_message}"
-      #  expire_data_after_sign_in!
-      #  respond_with resource, location: after_inactive_sign_up_path_for(resource)
-      #end
     else
       clean_up_passwords resource
       set_minimum_password_length
-      ##respond_with resource
-      #warden.custom_failure!
-      #render :json=> resource.errors, :status=>422
       render jsonapi_errors: resource.errors
-      #render json: {status: 'SUCCESS', message: resource.errors.full_messages}, status: 422
     end
   end
 

data/frontend/app/controllers/users/sessions_controller.rb

@@ -1,5 +1,7 @@
 class Users::SessionsController < Devise::SessionsController
   # before_action :configure_sign_in_params, only: [:create]
+  skip_before_action :verify_authenticity_token, only: [:create]
+  respond_to :json
 
   # GET /resource/sign_in
   # def new
@@ -7,9 +9,16 @@ class Users::SessionsController < Devise::SessionsController
   # end
 
   # POST /resource/sign_in
-  # def create
-  #   super
-  # end
+  def create
+    self.resource = warden.authenticate(auth_options)
+    if self.resource
+      render jsonapi: self.resource
+    else
+      render json: {
+        "errors": [ { "detail": "Authentication failed" } ]
+      }
+    end
+  end
 
   # DELETE /resource/sign_out
   # def destroy

data/frontend/app/lib/cmd.rb

@@ -0,0 +1,11 @@
+module Cmd
+
+
+  def self.run(cmd)
+    require 'open3'
+    Rails.logger.debug "DB8 Running\n#{cmd[0..180]}"
+    stdout, stderr, status = Open3.capture3(cmd)
+    Rails.logger.debug "DB8\nstatus:#{status}\nstdout:#{stdout}\nstderr:#{stderr}"
+  end
+
+end