perkins 0.0.3 → 0.0.5

data/lib/perkins/server.rb

@@ -1,5 +1,5 @@
 require 'sinatra/base'
-require 'sinatra/activerecord'
+require 'active_record'
 #require 'sinatra/reloader' #if ENV['RACK_ENV'] == "development"
 require 'pry'
 require 'json'
@@ -17,7 +17,7 @@ module Perkins
   class Server < Sinatra::Application
 
     attr_reader :app
-    set server: 'thin', connections: []
+    set server: 'rainbows', connections: []
     set :sessions, true
     set :foo, 'bar'
     enable :sessions
@@ -32,6 +32,13 @@ module Perkins
 
     register Perkins::Auth::Github
 
+    before /.*/ do
+      if request.url.match(/.json$/)
+        request.accept.unshift('application/json')
+        request.path_info = request.path_info.gsub(/.json$/,'')
+      end
+    end
+
     #authenticate all -
     before do
       unless %w[stream sse logout unauthenticated /auth/github/callback /repos/receiver badge].include? request.path_info.split('/')[1]
@@ -87,7 +94,6 @@ module Perkins
       content_type :json
       repo = find_repo(params)
       #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
 
@@ -101,8 +107,7 @@ module Perkins
     get '/repos/:login/:name/builds' do
       content_type :json
       repo = find_repo(params)
-      #respond or delay git load
-      repo.exists? ? repo.build_reports.to_json : enqueue_git_clone(repo)
+      repo.build_reports.to_json
     end
 
     get '/repos/:login/:name/builds/:build_id' do
@@ -110,23 +115,21 @@ module Perkins
       repo = find_repo(params)
       record = repo.build_reports.find(params[:build_id])
       #record.to_json
-      repo.exists? ? record.to_json : enqueue_git_clone(repo)
+      record.to_json
     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
+      hook = repo.get_hook
+      hook.try(:to_attrs).try(:to_json) || {}.to_json
     end
 
     #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
+      sha = github_user.api.commits(repo.name).first[:sha]
       repo.add_commit(sha, "master")
       repo.to_json
     end
@@ -134,24 +137,8 @@ module Perkins
     #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"}
-      if hook.present?
-        res = github_user.api.edit_hook(
-          repo.name,
-          hook["id"],
-          'web',
-          {:url => params[:webhook_url], :content_type => 'json'},
-          {:active => true}
-        )
-      else
-        res = github_user.api.create_hook(
-          repo.name,
-          'web',
-          { :url => params[:webhook_url], :content_type => 'json'},
-          { :events => ['push'], :active => true}
-        )
-      end
-      redirect "/repos/#{repo.name}/config"
+      hook = repo.add_hook(params[:webhook_url])
+      hook.try(:to_attrs).try(:to_json) || {}.to_json
     end
 
     get '/repos/:login/:name/builds/:build_id/restart' do
@@ -186,14 +173,27 @@ module Perkins
       github_user.api.user.to_attrs.merge({repos: repos}).to_json
     end
 
+    @@conns = []
 
     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) }
+      stream(:keep_open) do |out|
+        @@conns << out
+        out.callback { @@conns.delete(out) }
+      end
+    end
+
+    Thread.new do
+      redis = Redis.connect
+      redis.psubscribe('message', 'message.*') do |on|
+        on.pmessage do |match, channel, message|
+                    
+          channel = channel.sub('message.', '')
+
+          @@conns.each do |out|
+            out << "event: #{channel}\n"
+            out << "data: #{message}\n\n"
+          end
+        end
       end
     end
 
@@ -210,9 +210,11 @@ module Perkins
 
     def initialize(args={})
       super
-      return if args.blank?
-      puts "PerkinsCI environment loaded on #{args[:host]}:#{args[:port]}".green
+      #return if args.blank?
       app = Perkins::Application.instance
+      
+      puts "PerkinsCI #{settings.environment} environment loaded on #{app.host}:#{app.port}".green
+      
       self.class.set :perkins_application, app
       self.class.set :github_options, {
         :scopes => "admin:repo_hook,repo,user:email",
@@ -237,17 +239,13 @@ module Perkins
     def find_repo(params)
       id = "#{params[:login]}/#{params[:name]}"
       repo = Repo.find_by(name: id)
-      #repo.load_git #it seems that we dont need this here
       repo
     end
 
-    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")
+        image_path = "https://img.shields.io/badge/build-#{opts[:status]}-#{opts[:color]}.svg?style=flat-square"
+        url = URI.parse(image_path)
         result = Net::HTTP.get(url)
       rescue => e
         e
@@ -277,8 +275,6 @@ module Perkins
         #set :database, 'sqlite:///db/test.sqlite3'
       end
 
-      #::Perkins::Server.run!(options)
-
     end
 
     def self.start_listener(app_config)
@@ -291,7 +287,7 @@ module Perkins
     ####################################
 
     def default_data
-      {author: "miguel michelson", year: Time.now.year, app: @app}
+      { year: Time.now.year, app: @app}
     end
 
     helpers do

data/lib/perkins/socket_server.rb

@@ -0,0 +1,38 @@
+require 'goliath'
+require 'redis'
+
+module Perkins
+  class Subscribe < Goliath::API
+    def response(env)
+      EM.synchrony do
+        @redis = Redis.new(Options::redis)
+          channel = env["REQUEST_PATH"].sub(/^\/subscribe\//, '')
+
+          # We pass the subscribe method a block which describes what to
+          # do when we receive an event.
+          # This block writes the message formatted as a server sent event
+          # to the HTTP stream.
+          @redis.subscribe(channel) do |on|
+            on.message do |channel, message|
+              @message = message
+              env.stream_send(payload)
+            end
+          end
+        end
+      end
+      streaming_response(200, { 'Content-Type' => "text/event-stream" })
+     end
+    end
+
+    def on_close(env)
+      @redis.disconnect
+    end
+
+    def payload
+      "id: #{Time.now}\n" +
+      "data: #{@message}" +
+      "\r\n\n"
+    end
+   end
+  end
+end

data/lib/perkins/version.rb

@@ -1,3 +1,3 @@
 module Perkins
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/tasks/db_tasks.rake

@@ -0,0 +1,35 @@
+require "pry"
+require "perkins"
+require 'yaml'
+require 'logger'
+require 'active_record'
+
+include ActiveRecord::Tasks
+
+class Seeder
+  def initialize(seed_file)
+    @seed_file = seed_file
+  end
+
+  def load_seed
+    raise "Seed file '#{@seed_file}' does not exist" unless File.file?(@seed_file)
+    load @seed_file
+  end
+end
+
+
+root = Dir.pwd #File.expand_path '..', __FILE__
+DatabaseTasks.env = ENV['ENV'] || 'development'
+DatabaseTasks.database_configuration = YAML.load(File.read(File.join(root, 'config/database.yml')))
+DatabaseTasks.db_dir = File.join root, 'db'
+DatabaseTasks.fixtures_path = File.join root, 'test/fixtures'
+DatabaseTasks.migrations_paths = [File.join(root, 'db/migrate'), File.join(Perkins::ROOT_PATH, "db/migrate") ]
+DatabaseTasks.seed_loader = Seeder.new File.join root, 'db/seeds.rb'
+DatabaseTasks.root = root
+
+task :environment do
+  ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
+  ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
+end
+
+load 'active_record/railties/databases.rake'

data/perkins.gemspec

@@ -21,32 +21,29 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', ['>= 3', '< 4.1']
   spec.add_dependency 'activerecord', ['>= 3', '< 4.1']
 
-  spec.add_dependency "sinatra-activerecord"
   spec.add_dependency "sinatra-contrib"
   spec.add_dependency "sqlite3"
 
-  spec.add_runtime_dependency("git")
-  spec.add_runtime_dependency("celluloid")
-  spec.add_runtime_dependency("celluloid-io")
-  spec.add_runtime_dependency("redis")
-  spec.add_runtime_dependency("thor")
-  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("git")
+  spec.add_dependency("redis")
+  spec.add_dependency("thor")
+  spec.add_dependency("sinatra")
+  spec.add_dependency("haml")
+  spec.add_dependency("sprockets")
+  spec.add_dependency("haml_coffee_assets")
+  spec.add_dependency("yui-compressor")
+  spec.add_dependency("rdiscount")
+  spec.add_dependency("travis-yaml")
+  spec.add_dependency("redis-namespace")
+  spec.add_dependency("thin")
+  spec.add_dependency("sidekiq")
+  spec.add_dependency("dotenv-rails")
 
   spec.add_dependency "warden-github", "~>1.0"
 
   # I find it well worth to include CoffeeScript and SASS as well
-  spec.add_runtime_dependency( "coffee-script")
-  spec.add_runtime_dependency( "sass")
+  spec.add_dependency("coffee-script")
+  spec.add_dependency("sass")
 
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/spec/README.md

@@ -0,0 +1,3 @@
+## configure:
+#will read file in configure
+rake db:create:all ENV=test --trace

data/spec/lib/build/build_spec.rb

@@ -32,9 +32,9 @@ describe "Repo" do
     before :each do
       @repo = Perkins::Repo.where(cached: false).last
       allow_any_instance_of(Perkins::Repo).to receive(:check_config_existence).and_return(file)
-      @repo.load_git
-      expect(@repo.git).to be_instance_of(Git::Base)
-      @path = @repo.git.dir.path
+      #@repo.load_git
+      #expect(@repo.git).to be_instance_of(Git::Base)
+      #@path = @repo.git.dir.path
     end
 
     after :each do
@@ -46,8 +46,12 @@ describe "Repo" do
     end
 
     it "run run run should add a new report" do
+      @repo.load_git
       sha = @repo.git.log.map(&:sha).first
+      @repo.runner.report = @repo.build_reports.create
+     
       @repo.runner.run(sha)
+      expect(@repo.build_reports.last.build_status).to_not be_blank
       expect(@repo.build_reports.size).to be == 1
       #binding.pry
       #expect(@repo.runner.status).to be == true

data/spec/lib/repo_spec.rb

@@ -44,7 +44,6 @@ describe "Repo" do
     expect(r.name).to_not be_blank
     expect(r.id).to_not be_blank
     expect(r.url).to_not be_blank
-    #expect(r.local_path).to_not be_blank
   end
 
   context "load git" do
@@ -52,34 +51,32 @@ describe "Repo" 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
+    it "git will be not loaded" do
+      expect(@repo.git).to be_blank
     end
 
     it "will be downloaded after load_git" do
       @repo.load_git
-      expect(@repo.downloaded?).to be == true
+      expect(@repo.git).to be_present
+      expect(@repo.git.dir.path).to be == "/tmp/#{@repo.name}"
+      expect(File.exist?(@repo.git.dir.path)).to be_present
     end
-  end
 
-  context "loaded repo" do
-    before :each do
-      @repo = Perkins::Repo.first
+    it "override dir with virtual_sha" do
+      @repo.virtual_sha = "xxx"
       @repo.load_git
-      expect(@repo.git).to be_instance_of(Git::Base)
-      @path = @repo.git.dir.path
-    end
-
-    it "should download repo" do
-      expect(File.exist?(@path)).to be_present
+      expect(@repo.git).to be_present
+      expect(@repo.git.dir.path).to be == "/tmp/#{@repo.name}xxx"
+      expect(File.exist?(@repo.git.dir.path)).to be_present
     end
 
     it "should have a default runner" do
+      @repo.load_git
       expect(@repo.runner).to_not be_blank
     end
 
     it "should have branches" do
+      @repo.load_git
       expect(@repo.runner_branch).to be == ["master"]
       expect(@repo.branches).to include("master")
     end
@@ -97,33 +94,27 @@ describe "Repo" do
     it "should have a runner" do
       expect(@repo.runner).to be_instance_of(Perkins::Runner)
     end
-
-    it "runner true" do
-      sha = @repo.git.log.map(&:sha).first
-      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
 
   context "receive commit" do
     before :each do
       allow_any_instance_of(Perkins::Repo).to receive(:check_config_existence).and_return(file)
       @repo = Perkins::Repo.first
-      @repo.load_git
-      expect(@repo.git).to be_instance_of(Git::Base)
-      @path = @repo.git.dir.path
+      #@repo.load_git
+      #expect(@repo.git).to be_instance_of(Git::Base)
+      #@path = @repo.git.dir.path
+    end
+
+    it "will enqueue commit" do
+      sha = "123456789"
+      expect(@repo).to receive(:enqueue_commit) #.with(sha, "master")
+      @repo.add_commit(sha, "master")
     end
 
     it "will increment Worker jobs when receive commit " do
-      sha = @repo.git.log.map(&:sha).first
+      sha = "123456789"
       @repo.add_commit(sha, "master")
-      expect(@repo.new_commit).to be_instance_of(Perkins::Commit)
-      expect(Perkins::Worker.jobs.size).to be > 0
+      expect(Perkins::BuildWorker.jobs.size).to be > 0
     end
 
   end

data/spec/lib/runner_spec.rb

@@ -38,12 +38,20 @@ describe "Runner" do
       @runner = Perkins::Runner.new
       @runner.config = file
       @runner.repo = repo
+
+      report = Perkins::BuildReport.new
+      report.sha = "master" 
+      report.branch = "master"
+
+      @runner.repo.build_reports << report
+      @runner.repo.save
+
+      @runner.report = report
       #allow_any_instance_of(Perkins::Repo).to receive(:clone_or_load).and_return(true)
       #allow_any_instance_of(Perkins::Repo).to receive(:git).and_return(Git::Base.new)
     end
 
     it "runner should raise error in case it fails" do
-
       expect{@runner.run!}.to raise_error
     end
 
@@ -51,10 +59,19 @@ describe "Runner" do
       #allow_any_instance_of(Git::Base).to receive(:chdir).and_return(true)
       expect{@runner.run("master")}.to_not raise_error
       #expect(Git::Base).to have_received(:chdir)
-
       expect(@runner.duration).to be > 0
       expect(@runner).to_not be_running
+    end
+
+    it "will make repo in sha dir" do
+      #allow_any_instance_of(Git::Base).to receive(:chdir).and_return(true)
+      @runner.repo.virtual_sha = "master"
 
+      expect{@runner.run("master")}.to_not raise_error
+      #expect(Git::Base).to have_received(:chdir)
+      
+      expect(@runner.duration).to be > 0
+      expect(@runner).to_not be_running
     end
   end
 
@@ -63,6 +80,16 @@ describe "Runner" do
     before :each do
       repo.clone_or_load
       @runner = repo.runner
+
+
+      report = Perkins::BuildReport.new
+      report.sha = "master" 
+      report.branch = "master"
+      repo.build_reports << report
+      repo.branch = "master"
+      repo.save
+      @runner.report = report
+
     end
 
     it "should install bundler" do
@@ -73,5 +100,28 @@ describe "Runner" do
 
   end
 
+  context "build report" do 
+
+    let( :repo ){ Perkins::Repo.find_by(name: "michelson/godard") }
+    before :each do
+      repo.clone_or_load
+      @runner = repo.runner
+
+
+      @report = Perkins::BuildReport.new
+      @report.sha = "master" 
+      @report.branch = "master"
+      repo.build_reports << @report
+      repo.branch = "master"
+      repo.save
+      @runner.report = @report
+
+    end
+
+    it "retrieve_commit_info" do 
+      @report.retrieve_commit_info
+    end
+  end
+
 end