teamster 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6206844754e6167984d2917877c66c578b11754
-  data.tar.gz: ca07df0e85a826f4e0d70fe699599acac6529d24
+  metadata.gz: 7d93ad44983fe5b937e8c559ec945eb74a45dda9
+  data.tar.gz: 838c9848d967b9ea66e17b372bb54cc51979a726
 SHA512:
-  metadata.gz: 33d2f2642c2626cf1ac9b3f7156eda22925ac13fa6315f6406bbfc3a1eaf50b9dcd87fcd76347930ad6858a6545f0c0296dd86ee140662bb0cc3d400ceb58afd
-  data.tar.gz: fb59b51f9aa89d9678f209945d18d4d1e40f51c9947f0cd29e79d11a1252525dd717b86729b05245dbb01b5917a5c441b49936063520b21c52b27a5dbd9436fb
+  metadata.gz: 825caf684e6dbf9711cb325e7543b6c3ff3627cf5605600702c464b27b5b1b88c7968977cfe2da59cd010e3818f164bcf5fe3809680177f9fb2f6ee9ee14b8dc
+  data.tar.gz: 66497ff2540821ce4deb8fa7bceadf39d6482fcde393274895c60a0e4933c69991b6802d73b24ef45d995dfd16ccc5995e8c87f42c0975daa8e2a3690c94d180

data/.gitignore

@@ -1,2 +1,2 @@
 pkg/
-
+todo/

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/bin/teamster

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
-['fileutils', 'getoptlong', 'yaml', 'rubygems/package', 'zlib'].each do |gemfile|
-  require gemfile
-end
+
+require 'fileutils'
+require 'getoptlong'
+require 'yaml'
+require 'bcrypt'
+require 'base64'
 
 DEFAULT_UNIX_SOCKET_FILE = '/tmp/teamster.app.sock'
 DEFAULT_APP_STATE_FILE   = '/srv/my-site/teamster.app.state'
@@ -67,6 +70,8 @@ class TeamsterApp
       puts "Creating required content..."
       FileUtils.mkdir_p "conf"
       create_config
+      FileUtils.mkdir_p "data"
+      create_user
       FileUtils.cp_r "#{content}/views", current_working_folder
       FileUtils.cp_r "#{content}/public", current_working_folder
       create_file "config.ru", "config_ru"
@@ -125,6 +130,19 @@ class TeamsterApp
       File.open(CONFIG_FILE, 'w') {|fh| fh.write @config.to_yaml}
     end
 
+    def create_user
+      puts "Creating default user.."
+      users = [{"name" => "Administrator", "pass" => b64_enc(BCrypt::Password.create("password"))}]
+      File.open("./data/users", "w") do |fh|
+        fh.write({"users" => users}.to_yaml)
+      end
+      FileUtils.chmod 0600, './data/users'
+    end
+
+    def b64_enc(obj)
+      Base64.strict_encode64(obj)
+    end
+
     def ask_user_for(opt, question)
       unless @config[opt]
         @config[opt] = ask_user question

data/content/views/login.erb

@@ -0,0 +1,19 @@
+<div class="col-lg-12">
+  <div class="col-lg-4"></div>
+  <div class="col-lg-4">
+    <div class="panel panel-default">
+      <div class="panel-body">
+        <form role="form" name="login-form" action="/login" method="post">
+          <div class="form-group">
+            <input type="text" class="form-control" name="user" placeholder="Username">
+          </div>
+          <div class="form-group">
+            <input type="password" class="form-control" name="pass" placeholder="Password">
+          </div>
+          <button id="login-btn" type="submit" class="btn btn-default">Submit</button>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div class="col-lg-4"></div>
+</div>

data/lib/teamster/core_helper.rb

@@ -0,0 +1,26 @@
+module Teamster
+  module Core
+    module CoreHelper
+      def summary_div_class_for(index)
+        size = all_modules.size
+        if size == 1
+          "col-lg-12"
+        elsif size%2 == 0
+          "col-lg-6"
+        else
+          last = size - 1
+          index == last ? "col-lg-12" : "col-lg-6"
+        end
+      end
+
+      def summary_of(module_name)
+        name = module_name.downcase
+        if send(:"#{name}_summary?")
+          send(:"#{name}_summary")
+        else
+          erb :no_summary
+        end
+      end
+    end
+  end
+end

data/lib/teamster/general_helper.rb

@@ -85,8 +85,8 @@ module Teamster
         shuffle ? all_modules.shuffle : all_modules
       end
 
-      def find_template(views, name, engine, &block)
-        App.views.each {|v| super(v, name, engine, &block)}
+      def find_template(views, *args, &block)
+        App.views.each {|v| super(v, *args, &block)}
       end
     end
   end

data/lib/teamster/login.rb

@@ -1,22 +1,54 @@
+require 'bcrypt'
+require 'base64'
+require_relative 'login_helper'
+
 module Teamster
   module Core
     class Login < Sinatra::Base
-      helpers do
-        def redirect_back
-          referrer = URI::parse(request.referrer)
-          redirect to referrer.path
-        end
+      @@referrer = nil
+      @@root = Dir.pwd
+      USERS_FILE  = './data/users'
+
+      configure do
+        set :root, @@root
+        set :views, "#{settings.root}/views"
+        set :users, YAML.load_file("#{settings.root}/#{USERS_FILE}").fetch("users")
+        set :referrer, nil
       end
 
+      helpers GeneralHelper, LoginHelper
+
       get '/login/?' do
-        session[:current_user] = "A Registered User (Login Not Implemented)"
-        redirect_back
+        referrer URI::parse(request.referrer)
+        erb :login
+      end
+
+      post '/login' do
+        if user = settings.users.find {|u| u['name'] == params[:user]}
+          if BCrypt::Password.new(decode(user['pass'])) == params[:pass]
+            session[:current_user] = user['name']
+            redirect_back
+          else
+            login_error
+          end
+        else
+          login_error
+        end
       end
 
       get '/logout/?' do
+        referrer URI::parse(request.referrer)
         session[:current_user] = nil
         redirect_back
       end
+
+      def self.referrer
+        @@referrer
+      end
+
+      def self.set_referrer_to(path)
+        @@referrer = path
+      end
     end
   end
 end

data/lib/teamster/login_helper.rb

@@ -0,0 +1,23 @@
+module Teamster
+  module Core
+    module LoginHelper
+      def decode(obj)
+        Base64.decode64 obj
+      end
+
+      def referrer(ref)
+        settings.referrer = ref.path
+      end
+
+      def redirect_back
+        ref = settings.referrer || '/'
+        settings.referrer = nil
+        redirect to ref
+      end
+
+      def login_error
+        halt 403, 'Wrong username or password provided!'
+      end
+    end
+  end
+end

data/lib/teamster.rb

@@ -2,9 +2,9 @@ require 'sinatra/base'
 require 'yaml'
 require 'json'
 require 'uri'
-require_relative 'teamster/login'
 require_relative 'teamster/general_helper'
-require_relative 'teamster/base_module'
+require_relative 'teamster/core_helper'
+require_relative 'teamster/login'
 
 module Teamster
   module Core
@@ -12,7 +12,8 @@ module Teamster
       @@modules   = []
       @@views     = []
       @@title     = 'TEAMSTER'
-      CORE_CONFIG = 'conf/teamster.conf'
+      @@root      = Dir.pwd
+      CORE_CONFIG = './conf/teamster.conf'
 
       # NOTE: Class methods used in configure block needs be declared
       #       before the configure block.
@@ -20,47 +21,23 @@ module Teamster
         @@title = core_opts[:title]
       end
 
-      def self.current_working_folder
-        Dir.pwd
-      end
-
       configure do
-        set :root, current_working_folder
+        set :root, @@root
+        set :referrer, nil
         @@views << "#{settings.root}/views"
         enable :sessions
         set :session_secret, 'THIS IS MY SESSION SECRET KEY'
-        set :core_opts, YAML.load_file(CORE_CONFIG)
+        set :core_opts, YAML.load_file("#{settings.root}/#{CORE_CONFIG}")
         set_default_options_from settings.core_opts
         use Login
       end
 
-      helpers GeneralHelper
+      helpers GeneralHelper, CoreHelper
 
       get '/' do
         erb :index
       end
 
-      def summary_div_class_for(index)
-        size = all_modules.size
-        if size == 1
-          "col-lg-12"
-        elsif size%2 == 0
-          "col-lg-6"
-        else
-          last = size - 1
-          index == last ? "col-lg-12" : "col-lg-6"
-        end
-      end
-
-      def summary_of(module_name)
-        name = module_name.downcase
-        if send(:"#{name}_summary?")
-          send(:"#{name}_summary")
-        else
-          erb :no_summary
-        end
-      end
-
       def self.modules
         @@modules
       end
@@ -73,6 +50,10 @@ module Teamster
         @@title
       end
 
+      def self.current_working_folder
+        @@root
+      end
+
       def self.use_module(teamster_module)
         if @@modules.include? teamster_module
           puts "Module #{teamster_module} already registered!"
@@ -91,3 +72,5 @@ module Teamster
     end
   end
 end
+
+require_relative 'teamster/base_module'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teamster
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Nur Muhammad Bin Sirat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -53,7 +53,6 @@ files:
 - Rakefile
 - VERSION
 - bin/teamster
-- config.ru
 - content/public/css/bootstrap.min.css
 - content/public/css/styles.css
 - content/public/fonts/glyphicons-halflings-regular.eot
@@ -66,13 +65,16 @@ files:
 - content/views/footer.erb
 - content/views/index.erb
 - content/views/layout.erb
+- content/views/login.erb
 - content/views/login_required.erb
 - content/views/navbar.erb
 - content/views/no_summary.erb
 - lib/teamster.rb
 - lib/teamster/base_module.rb
+- lib/teamster/core_helper.rb
 - lib/teamster/general_helper.rb
 - lib/teamster/login.rb
+- lib/teamster/login_helper.rb
 - teamster.gemspec
 homepage: https://github.com/Umartyya/teamster
 licenses:

data/config.ru

@@ -1,2 +0,0 @@
-require './lib/teamster'
-run Teamster::App