perkins 0.0.1 → 0.0.2

data/lib/perkins/server.rb

@@ -9,48 +9,11 @@ require 'coffee_script'
 require "sass"
 require "rdiscount"
 require "perkins/auth/github"
+require "perkins/assets"
+require "eventmachine"
 
 module Perkins
 
-  class Assets < Sinatra::Base
-
-    configure do
-      set :assets, (Sprockets::Environment.new { |env|
-        env.append_path(settings.root + "/assets/images")
-        env.append_path(settings.root + "/assets/javascripts")
-        env.append_path(settings.root + "/assets/stylesheets")
-        # compress everything in production
-        if ENV["RACK_ENV"] == "production"
-          env.js_compressor  = YUI::JavaScriptCompressor.new
-          env.css_compressor = YUI::CssCompressor.new
-        end
-      })
-    end
-
-    get "/assets/app.js" do
-      content_type("application/javascript")
-      settings.assets["app.js"]
-    end
-
-    get "/assets/app.css" do
-      content_type("text/css")
-      settings.assets["app.css"]
-    end
-
-    %w{jpg png}.each do |format|
-      get "/assets/:image.#{format}" do |image|
-        content_type("image/#{format}")
-        settings.assets["#{image}.#{format}"]
-      end
-    end
-
-    get "/assets/:image.svg" do |image|
-      content_type("image/svg+xml")
-      settings.assets["#{image}.svg"]
-    end
-
-  end
-
   class Server < Sinatra::Application
 
     attr_reader :app
@@ -61,12 +24,30 @@ module Perkins
     #set :environment, :production
     set :session_secret, '*&(^B234'
 
+    configure :development do
+      #register Sinatra::Reloader
+    end
+
     use Perkins::Assets
 
     register Perkins::Auth::Github
 
+    #authenticate all -
+    before do
+      unless %w[stream sse logout unauthenticated /auth/github/callback /repos/receiver badge].include? request.path_info.split('/')[1]
+        authenticate!
+      end
+    end
+
+    #render index if not ajax request!
+    before do
+      return if %w[stream sse logout unauthenticated /auth/github/callback /repos/receiver badge config].include? request.path_info.split('/')[1]
+      unless request.xhr?
+        halt 200, haml( :index , locals: default_data)
+      end
+    end
+
     get '/' do
-      authenticate!
       haml :index , locals: default_data
     end
 
@@ -74,19 +55,23 @@ module Perkins
       settings.perkins_application.to_json
     end
 
-    get '/repos/sync' do
-      @github_repos = build_data
+    #get '/repos/sync' do
+    #  @github_repos = build_data
+    #end
+
+    get '/repos' do
+      content_type :json
+      repos = Perkins::Repo.added.all
+      repos.to_json
     end
 
     post '/repos/receiver' do
       #NEEDS VALIDATIONS
       payload = JSON.parse request.body.read
       repo = Perkins::Repo.added.find_by(gb_id: payload["repository"]["id"])
-      repo.load_git
-
+      #repo.load_git
       pushed_branch = payload["ref"].split('/').last
       repo.add_commit(payload["after"], pushed_branch)
-      #binding.pry
       "received post #{payload}"
     end
 
@@ -96,42 +81,57 @@ module Perkins
       Repo.sync_github_repo(repo)
       r = Repo.add_from_github(params[:id])
       r.to_json
-      redirect "/me"
     end
 
     get '/repos/:login/:name' do
+      content_type :json
       repo = find_repo(params)
-      record = repo.build_reports.last
-      haml :"repos/repo" , locals: {repo: repo, build: record }
+      #detects a recently added repo (no dir and no prev builds)
+      enqueue_git_clone(repo) if !repo.exists? && repo.last_report_id.blank?
+      repo.as_json(methods: [:last_report_id,  :http_url]).to_json
+    end
+
+    get '/badge' do
+      content_type "image/svg+xml"
+      repo = Repo.find_by(name: params[:repo])
+      build = repo.build_reports.last
+      request_badge({status: build.status ? "passing" : "error" , color: build.status ? "green" : "red" })
     end
 
     get '/repos/:login/:name/builds' do
+      content_type :json
       repo = find_repo(params)
-      haml :builds , locals: {repo: repo, builds: repo.build_reports }
+      #respond or delay git load
+      repo.exists? ? repo.build_reports.to_json : enqueue_git_clone(repo)
     end
 
     get '/repos/:login/:name/builds/:build_id' do
+      content_type :json
       repo = find_repo(params)
       record = repo.build_reports.find(params[:build_id])
-
-      haml :"repos/repo" , locals: {repo: repo, build: record }
-    end
-
-    get '/repos/:login/:name/run_commit' do
-      repo = find_repo(params)
-      sha = repo.git.log.map(&:sha).first
-      repo.add_commit(sha, "master")
-      redirect "/repos/#{repo.name}"
+      #record.to_json
+      repo.exists? ? record.to_json : enqueue_git_clone(repo)
     end
 
     get '/repos/:login/:name/config' do
+      content_type :json
       repo = find_repo(params)
       #find by id
       hook = github_user.api.hooks("#{repo.name}").detect{|o| o[:name] == "web"}
+      hook.to_attrs.to_json
+    end
 
-      haml :"repos/config" , locals: {repo: repo, hook: hook}
+    #TODO send this through bg job
+    get '/repos/:login/:name/run_commit' do
+      content_type :json
+      repo = find_repo(params)
+      repo.load_git
+      sha = repo.git.log.map(&:sha).first
+      repo.add_commit(sha, "master")
+      repo.to_json
     end
 
+    #TODO for json
     post '/repos/:login/:name/add_hook' do
       repo = find_repo(params)
       hook = github_user.api.hooks("#{repo.name}").detect{|o| o[:name] == "web"}
@@ -155,56 +155,52 @@ module Perkins
     end
 
     get '/repos/:login/:name/builds/:build_id/restart' do
+      content_type :json
       repo = find_repo(params)
+      #repo.load_git
       record = repo.build_reports.find(params[:build_id])
       repo.add_commit(record['sha'], record['branch'])
-      redirect "/repos/#{repo.name}"
-    end
-
-    get '/stream', provides: 'text/event-stream' do
-      stream :keep_open do |out|
-        settings.connections << out
-        out.callback { settings.connections.delete(out) }
-      end
-    end
-
-    post '/sse' do
-      settings.connections.each { |out| out << "data: #{params[:msg]}\n\n" }
-      204 # response without entity body
+      record.to_json
     end
 
     get '/me' do
-      authenticate!
-      #binding.pry
-      #repos = github_repos
-      haml :profile, locals: { user: github_user.api }
-      #haml :"repos/github", locals: {repos: repos}
-      #"Hello There, #{github_user.name}! You have access to the #{params['id']} organization."
-    end
-
-    get '/myrepos' do
-      authenticate!
-      repos = github_user.api.repos
-      haml :"repos/github", locals: { user: github_user.api, repos: repos }
+      content_type :json
+      a = github_user.api
+      @user = a.user
+      @orgs = a.orgs.map(&:login)
+      @user.to_attrs.merge({orgs: @orgs}).to_json
     end
 
     get '/orgs/:id' do
+      content_type :json
       github_organization_authenticate!(params['id'])
-      #"Hello There, #{github_user.name}! You have access to the #{params['id']} organization."
       org  = github_user.api.organization(params['id'])
-      orgs = github_user.api.orgs
-      repos = github_user.api.org_repos(params["id"])
-      haml :orgs, locals: { org: org, orgs: orgs, repos: repos }
+      #orgs = github_user.api.orgs
+      repos = github_user.api.org_repos(params["id"]).map(&:to_attrs)
+      org.to_attrs.merge({repos: repos}).to_json
     end
 
-    get '/publicized_orgs/:id' do
-      github_publicized_organization_authenticate!(params['id'])
-      "Hello There, #{github_user.name}! You are publicly a member of the #{params['id']} organization."
+    #TODO for json
+    get '/myrepos' do
+      repos = github_user.api.repos.map(&:to_attrs)
+      github_user.api.user.to_attrs.merge({repos: repos}).to_json
     end
 
-    get '/teams/:id' do
-      github_team_authenticate!(params['id'])
-      "Hello There, #{github_user.name}! You have access to the #{params['id']} team."
+
+    get '/stream', provides: 'text/event-stream' do
+      stream :keep_open do |out|
+        #EM.run {
+        #  EventMachine::PeriodicTimer.new(20) { out << "data: \n\n" } # added
+        #}
+        settings.connections << out
+        out.callback { settings.connections.delete(out) }
+      end
+    end
+
+    post '/sse' do
+      puts "connections #{settings.connections.size}".yellow
+      settings.connections.each { |out| out << "data: #{params[:msg]}\n\n" }
+      204 # response without entity body
     end
 
     get '/logout' do
@@ -212,11 +208,17 @@ module Perkins
       redirect 'https://github.com'
     end
 
-    def initialize(*args)
+    def initialize(args={})
       super
-      puts "Start Perkins server"
-      #check_project
-      #@app = Perkin.new(options.project_path)
+      return if args.blank?
+      puts "PerkinsCI environment loaded on #{args[:host]}:#{args[:port]}".green
+      app = Perkins::Application.instance
+      self.class.set :perkins_application, app
+      self.class.set :github_options, {
+        :scopes => "admin:repo_hook,repo,user:email",
+        :secret => app.github_client_secret,
+        :client_id => app.github_client_id,
+      }
     end
 
     def github_repos
@@ -235,26 +237,32 @@ module Perkins
     def find_repo(params)
       id = "#{params[:login]}/#{params[:name]}"
       repo = Repo.find_by(name: id)
-      repo.load_git
+      #repo.load_git #it seems that we dont need this here
       repo
     end
 
-    def self.start(config_file, options)
+    def enqueue_git_clone(repo)
+      GitLoaderWorker.perform_async(repo.id )
+    end
+
+    def request_badge(opts={})
+      begin
+        url = URI.parse("https://img.shields.io/badge/build-#{opts[:status]}-#{opts[:color]}.svg?style=flat-square")
+        result = Net::HTTP.get(url)
+      rescue => e
+        e
+      end
+    end
 
+    ####################################
+    #TODO: deprecate this
+    def self.start(app, options)
       options = options.dup
       ENV['RACK_ENV'] = options.delete("e")
 
-      app = eval(File.open(config_file).read)
-      self.start_listener(app)
-
-      set :perkins_application, app
-      set :github_options, {
-        :scopes => "admin:repo_hook,repo,user:email",
-        :secret => app.github_client_secret,
-        :client_id => app.github_client_id,
-      }
-
       register Sinatra::ActiveRecordExtension
+      app = app.is_a?(String) ? eval(File.open(app).read) : app
+      self.start_listener(app)
 
       configure :development do
         #register Sinatra::Reloader
@@ -269,7 +277,8 @@ module Perkins
         #set :database, 'sqlite:///db/test.sqlite3'
       end
 
-      Perkins::Server.run! options
+      #::Perkins::Server.run!(options)
+
     end
 
     def self.start_listener(app_config)
@@ -279,11 +288,8 @@ module Perkins
         listener.run!
       end
     end
+    ####################################
 
-    ##use in rack
-    ##And a corresponding config.ru:
-    #require './app'
-    #run Sinatra::Application
     def default_data
       {author: "miguel michelson", year: Time.now.year, app: @app}
     end
@@ -299,7 +305,6 @@ module Perkins
         status ? "glyphicon glyphicon-ok" : "glyphicon glyphicon-remove"
       end
 
-
       def avatar_url(email, size)
         gravatar_id = Digest::MD5.hexdigest(email.downcase)
         "http://gravatar.com/avatar/#{gravatar_id}.png?s=#{size}"

data/lib/perkins/version.rb

@@ -1,3 +1,3 @@
 module Perkins
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/perkins/views/builds.haml

@@ -41,6 +41,3 @@
             = "#{build.duration.to_i.round(2)} secs"
           %td
             %abbr.timeago{title:build.build_time}
-
-
-

data/lib/perkins/views/layout.haml

@@ -15,39 +15,28 @@
       minispade.require('log')
 
   %body
-    = haml :menu
-
-    .container
-      #content
-        #left-wrap.col-sm-3
-
-          #sidebar.affix
-            #sidebar-header
-              .pull-right
-                %a.btn{href: "/me", title: "Add new repository"}
-                  %span.glyphicon.glyphicon-plus
-
-              %h4.title Repos
-
-            %ul.nav.nav-stacked{style: "overflow:scroll;height:100%"}
-              - Perkins::Repo.added.all.each do |repo|
-                %li
-                  %a{:href => "/repos/#{repo.name}"}
-                    = repo.name
-                    = haml :"repos/spinner", locals: {repo: repo}
-
-        #main-content.col-sm-9
-          = yield
-
-      #inner
-
-    .clearfix
-    #footer
-      -#= render 'footer'
-      .pull-right
-        Copyright © #{Time.now.year} Perkins
-      %strong
-        Redis connection:
-      %span
-        = $redis.client.host
-        = $redis.client.port
+    #perkins-layout
+      %nav#main-menu.navbar.navbar-fixed-top{role:"navigation"}
+
+      -#= haml :menu
+
+      .container
+        #content
+          #left-wrap.col-sm-3
+            #sidebar.affix.col-sm-3
+
+          #main-content.col-sm-9
+            -#= yield
+
+        #inner
+
+      .clearfix
+      #footer
+        -#= render 'footer'
+        .pull-right
+          Copyright © #{Time.now.year} Perkins
+        %strong
+          Redis connection:
+        %span
+          = $redis.client.host
+          = $redis.client.port

data/lib/perkins/views/menu.haml

@@ -1,4 +1,4 @@
-%nav.navbar.navbar-fixed-top{role:"navigation"}
+%nav#main-menu.navbar.navbar-fixed-top{role:"navigation"}
   .container
     .navbar-header
       %button.navbar-toggle{"data-target" => ".nav-collapse", "data-toggle" => "collapse", :type => "button"}

data/lib/perkins/views/repos/github.haml

@@ -6,37 +6,6 @@
     %span.glyphicon.glyphicon-refresh
     SYNC
 
--#
-  - repos.each do |repo|
-    %ul.list-group
-      %li.list-group-item
-
-        .pull-right
-          %a.btn{href: "/repos/add/#{repo.gb_id}"}
-            ADD REPO
-            %span.btn.glyphicon.glyphicon-plus-sign
-
-        .row
-          %span.col-sm-1
-            %a{src: repo.github_data["owner"]["url"] }
-              %img{ src: repo.github_data["owner"]["avatar_url"], width: 66 }
-          %span.col-sm-8
-            %h4= repo.name
-            %a{href: repo.url}
-              view on github
-            %p
-        .clearfix
-        .well
-          %p= repo.github_data["description"]
-        -#
-          %p
-            clone url:
-            = repo.github_data["clone_url"]
-
-        %span
-          = repo.github_data["fork"]
-          = repo.github_data["private"]
-
 - if repos.any?
   %h2 Repositories:
 

data/lib/perkins/views/repos/repo.haml

@@ -29,7 +29,7 @@
           %abbr.timeago{title:build.build_time}
           %br
           duration:
-          %strong= build.duration.to_i.round(2)
+          %strong= Perkins.Helpers.round(build.duration.to_i)
 
 
         .col-sm-12

data/lib/perkins.rb

@@ -7,12 +7,14 @@ require 'redis'
 require 'redis-namespace'
 require "travis/yaml"
 require "active_record"
+require "sidekiq"
 
 require 'dotenv'
 Dotenv.load
 require 'octokit'
 Octokit.auto_paginate = true
 #require 'core_ext/hash/deep_symbolize_keys'
+require 'core_ext/string/color'
 
 module Perkins
     autoload  :VERSION, 'perkins/version.rb'
@@ -22,8 +24,8 @@ module Perkins
     autoload  :Build,  'perkins/build.rb'
     autoload  :Commit,  'perkins/commit.rb'
     autoload  :Server,  'perkins/server.rb'
-    autoload  :Worker,  'perkins/worker.rb'
-    autoload  :Listener,  'perkins/listener.rb'
+    autoload  :BuildWorker,  'perkins/build_worker.rb'
+    autoload  :GitLoaderWorker,  'perkins/git_loader_worker.rb'
     autoload  :ThorUtils, 'perkins/thor_utils.rb'
     autoload  :Logger,  'perkins/logger.rb'
     autoload  :Application,  'perkins/application.rb'

data/perkins.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Perkins::VERSION
   spec.authors       = ["miguel michelson"]
   spec.email         = ["miguelmichelson@gmail.com"]
-  spec.summary       = "Thin CI"
-  spec.description   = "Minimal CI"
+  spec.summary       = "A travis compatible standalone CI solution for ruby"
+  spec.description   = "Continous integration solution compatible with travis.ci"
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -33,11 +33,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("sinatra")
   spec.add_runtime_dependency("haml")
   spec.add_runtime_dependency("sprockets")
+  spec.add_runtime_dependency("haml_coffee_assets")
   spec.add_runtime_dependency("yui-compressor")
   spec.add_runtime_dependency("rdiscount")
   spec.add_runtime_dependency("travis-yaml")
   spec.add_runtime_dependency("redis-namespace")
   spec.add_runtime_dependency("thin")
+  spec.add_runtime_dependency("sidekiq")
+  spec.add_runtime_dependency("dotenv-rails")
 
   spec.add_dependency "warden-github", "~>1.0"
 

data/spec/lib/repo_spec.rb

@@ -47,6 +47,22 @@ describe "Repo" do
     #expect(r.local_path).to_not be_blank
   end
 
+  context "load git" do
+    before :each do
+      @repo = Perkins::Repo.first
+    end
+
+    it "will not be downloaded" do
+      expect(@repo.download_status).to be_blank
+      expect(@repo.downloaded?).to be == false
+    end
+
+    it "will be downloaded after load_git" do
+      @repo.load_git
+      expect(@repo.downloaded?).to be == true
+    end
+  end
+
   context "loaded repo" do
     before :each do
       @repo = Perkins::Repo.first
@@ -56,7 +72,7 @@ describe "Repo" do
     end
 
     it "should download repo" do
-      expect(File.exists?(@path)).to be_present
+      expect(File.exist?(@path)).to be_present
     end
 
     it "should have a default runner" do
@@ -82,11 +98,15 @@ describe "Repo" do
       expect(@repo.runner).to be_instance_of(Perkins::Runner)
     end
 
-    it "run run run" do
+    it "runner true" do
       sha = @repo.git.log.map(&:sha).first
-      @repo.runner.run(sha)
-      #expect(@repo.runner.status).to be == true
-      #expect(@repo.runner.response).to_not be_blank
+      allow_any_instance_of(Perkins::Runner).to receive(:run_script).and_return("stubbed")
+      allow_any_instance_of(Perkins::Runner).to receive(:successful_command?).and_return(true)
+      runner = @repo.runner
+      runner.run(sha)
+      expect(runner.response).to be == "stubbed"
+      expect(runner.status).to be == true
+      expect(@repo.build_status).to be == "stopped"
     end
   end
 
@@ -99,10 +119,11 @@ describe "Repo" do
       @path = @repo.git.dir.path
     end
 
-    it "receive commit" do
+    it "will increment Worker jobs when receive commit " do
       sha = @repo.git.log.map(&:sha).first
       @repo.add_commit(sha, "master")
       expect(@repo.new_commit).to be_instance_of(Perkins::Commit)
+      expect(Perkins::Worker.jobs.size).to be > 0
     end
 
   end

data/spec/lib/runner_spec.rb

@@ -20,6 +20,7 @@ describe "Runner" do
 
   before(:each) do
     perkins_app
+
     Perkins::Repo.delete_all
     allow_any_instance_of(Warden::GitHub::User).to receive(:api).and_return(user_api)
     @user = Warden::GitHub::User.new

data/spec/lib/server_spec.rb

@@ -55,36 +55,18 @@ describe 'Server App' do
     it "profile" do
       allow_any_instance_of(Warden::GitHub::User).to receive(:api).and_return(user_api)
       get "/me"
-      #puts last_response.body
       expect(last_response).to be_ok
     end
 
     describe "github" do
 
-      it "sync" do
-
-        allow_any_instance_of(Warden::GitHub::User).to receive(:api).and_return(user_api)
-
-        get "/repos/sync"
-
-        follow_redirect!
-
-        expect("http://example.org/me").to be == last_request.url
-
-        expect(last_response).to be_ok
-
-        expect(Perkins::Repo.synced_records).to be_any
-      end
-
       it "add repo" do
         allow_any_instance_of(Warden::GitHub::User).to receive(:api).and_return(user_api)
         a = Warden::GitHub::User.new
         Perkins::Repo.sync_github_repos(a)
         repo = Perkins::Repo.synced_records.first
-        get "/repos/add/#{repo.gb_id}"
-        follow_redirect!
-        expect("http://example.org/me").to be == last_request.url
-        expect(last_response).to be_ok
+        xhr("/repos/add/#{repo.gb_id}")
+        expect(last_response.body).to be == "true"
         expect(Perkins::Repo.find(repo.id).github_data).to_not be_blank
       end
 
@@ -92,9 +74,10 @@ describe 'Server App' do
         allow_any_instance_of(Warden::GitHub::User).to receive(:api).and_return(user_api)
         a = Warden::GitHub::User.new
         Perkins::Repo.sync_github_repos(a)
-        allow_any_instance_of(Perkins::Repo).to receive(:check_config_existence).and_return(file)
-        get "/repos/#{Perkins::Repo.last.github_data["full_name"]}"
-        expect(last_response.body).to include(Perkins::Repo.last.name)
+        repo = Perkins::Repo.synced_records.first
+        allow_any_instance_of(Perkins::Server).to receive(:find_repo).and_return(repo)
+        xhr "/repos/name/any_repo"
+        expect(last_response.body).to include(repo.name)
       end
 
       it "receive hook" do