bait 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58891295fc38209a37141334e62a3a03561bcffc
-  data.tar.gz: 0aefe33c5cd7c7f2cbb9a3231a8258e196352f53
+  metadata.gz: cee1932d37be141c2cb617fa4ad5661a59495274
+  data.tar.gz: f1e5303b6be8f932951b8322c92603d284a7972e
 SHA512:
-  metadata.gz: 1127e37a377f460b70fcdccec3a8b6491b6636b5cddfa6479475ea622ecda0f77623679572f23fc167927a90ab0841f040864106f37eb9a9409e62d73d3ef9ad
-  data.tar.gz: 5b544f86eca0307b17b5fb6e9547eea4659c9fc5e57ec8f76e14867bbcf9f673dda983321bf6eb7bfad91b7aa8e9f0febe4d4ace33015132637a077d096ed764
+  metadata.gz: cb113c97d9f79a07f302fdb9170cdc7f1489bdf329e9e2dbc6f480adc7d6649206cfc08621ab1c98e6df703cb978231fefdbec9ab18caa05f1ee5a42bc98fea5
+  data.tar.gz: faeec3db06ee35a2347910ced47aaa5ea181385a15e02dcc8fee24d51ef0bee23828aa5fa1fe1988d7d463b7338164d3e2488a5442059566811c73f4ef8073cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bait (0.5.4)
+    bait (0.5.5)
       git
       haml
       moneta

data/README.md

@@ -59,6 +59,15 @@ bait provides a Sinatra endpoint for the github push event webhook.
 When the repo is cloned, an bait executes a file relative to your
 project. This file must exist in order to use bait: `.bait/test.sh`
 
+## SimpleCov Support
+
+If your test suite builds the path `coverage/index.html` such as SimpleCov does
+then bait will detect it and provide access to it from a link in the UI.
+
+This feature was introduced in bait v0.5.4
+
+# Extended Information
+
 ## .bait/test.sh
 
 In this file you will run your test suite. **Be sure to make it

data/Rakefile

@@ -13,47 +13,40 @@ end
 
 namespace :assets do
   task :precompile do
-    public = File.join File.dirname(__FILE__), %w(lib bait public)
-    require 'bait/api'
-    include Sinatra::AssetSnack::InstanceMethods
-    Sinatra::AssetSnack.assets.each do |assets|
-      compiled_path = File.join public, assets[:route]
-      puts "compiling #{compiled_path}"
-      File.open(compiled_path, 'w') do |file|
-        response = compile assets[:paths]
-        file.write response[:body]
-      end
-    end
+    require 'bait'
+    Bait.assets.compile!
   end
 end
 
-
 def git_master?
   `git branch | grep '* master'`
   $?.exitstatus == 0
 end
 
-def git_dirty?
-  `git status --porcelain`.match(/^\sM/)
+namespace :git do
+  task :dirty do
+    if `git status --porcelain`.match(/M /)
+      puts "Dirty working tree! Commit first before building!"
+      exit
+    end
+  end
 end
 
 namespace :gem do
   task :build do
     `bundle install`
+    Rake::Task['git:dirty'].invoke
     if !git_master?
       puts "I'll only build the gem on the master branch"
     else
-      puts "On master branch"
+      puts "On master branch, running test suite; please wait."
       `rspec spec`
       if $?.exitstatus != 0
         puts "Uhh.. you have failing specs -- not building the gem"
       else
         puts "Specs pass. you're ready"
         Rake::Task['assets:precompile'].invoke
-        if git_dirty?
-          puts "Dirty working tree! Commit first before building!"
-          exit
-        end
+        Rake::Task['git:dirty'].invoke
         puts `gem build bait.gemspec`
         puts "Done! You can gem push that now"
       end
@@ -64,8 +57,14 @@ namespace :gem do
     require "bait/version"
     gem = "bait-#{Bait::VERSION}.gem"
     if File.exists?(gem)
-      puts "Pushing gem to rubygems"
-      puts `gem push #{gem}`
+      begin
+        puts "Press any key to push to Rubygems"
+        STDIN.gets
+        puts "Pushing gem to rubygems"
+        puts `gem push #{gem}`
+      rescue Interrupt
+        puts "ancelled"
+      end
     else
       puts "File not found #{gem}"
     end

data/VERSION

@@ -1,3 +1,3 @@
-0.5.4
+0.5.5
 
 

data/lib/bait.rb

@@ -1,38 +1,47 @@
 require "bait/version"
 require 'moneta'
 require 'fileutils'
+require 'bait/assets'
 
 module Bait
-  def self.storage_dir
-    path = File.join("#{self.home}", "#{self.env}")
-    FileUtils.mkdir_p path
-    path
-  end
+  class << self
+    include Bait::Assets
 
-  def self.db_dir
-    db_dir = File.join self.storage_dir, "databases"
-    FileUtils.mkdir_p db_dir
-    db_dir
-  end
+    def storage_dir
+      path = File.join("#{home}", "#{env}")
+      FileUtils.mkdir_p path
+      path
+    end
 
-  def self.db_file name
-    yaml_file = File.join self.db_dir, "#{name}.yaml"
-    FileUtils.touch yaml_file
-    yaml_file
-  end
+    def db_dir
+      db_dir = File.join storage_dir, "databases"
+      FileUtils.mkdir_p db_dir
+      db_dir
+    end
 
-  def self.store
-    @store ||= begin
-      Moneta.new :YAML, :file => db_file("main")
+    def db_file name
+      yaml_file = File.join db_dir, "#{name}.yaml"
+      FileUtils.touch yaml_file
+      yaml_file
     end
-  end
 
-  def self.env
-    ENV['RACK_ENV'] ||= 'production'
-  end
+    def store
+      @store ||= begin
+        Moneta.new :YAML, :file => db_file("main")
+      end
+    end
+
+    def env
+      ENV['RACK_ENV'] ||= 'production'
+    end
 
-  def self.home
-    File.join Etc.getpwuid.dir, '.bait'
+    def home
+      File.join Etc.getpwuid.dir, '.bait'
+    end
+
+    def public
+      Pathname.new(File.join(File.dirname(__FILE__), 'bait', 'public'))
+    end
   end
 end
 

data/lib/bait/api.rb

@@ -6,23 +6,14 @@ require 'json'
 require 'bait/pubsub'
 require 'bait/build'
 
-if Bait.env != "production"
-  require 'sinatra/asset_snack' 
-  DYNAMIC_ASSETS = true
-  require 'fileutils'
-  public = File.join File.dirname(__FILE__), %w(public)
-  [%w(js application.js), %w(css application.css)].each do |i|
-    path = File.join(public, i)
-    FileUtils.rm(path) if File.exists?(path)
-  end
-end
-
 module Bait
   class Api < Sinatra::Base
     set :port, 8417
     set server: 'thin'
 
-    if defined? DYNAMIC_ASSETS
+    if Bait.assets.dynamic?
+      Bait.assets.remove!
+      require 'sinatra/asset_snack'
       register Sinatra::AssetSnack
       asset_map '/js/application.js', ['app/js/**/*.js', 'app/js/**/*.coffee']
       asset_map '/css/application.css', ['app/css/**/*.css', 'app/css/**/*.scss']

data/lib/bait/assets.rb

@@ -0,0 +1,35 @@
+module Bait
+  module Assets
+    def assets
+      Class.new do
+        def missing?
+          !Bait.public.join('js', 'application.js').exist? &&
+          !Bait.public.join('css', 'application.css').exist?
+        end
+
+        def remove!
+          FileUtils.rm(Bait.public.join('js', 'application.js')) rescue nil
+          FileUtils.rm(Bait.public.join('css', 'application.css')) rescue nil
+        end
+
+        def dynamic?
+          Bait.env != "production"
+        end
+
+        def compile!
+          Module.new do
+            require 'bait/api'
+            require 'sinatra/asset_snack'
+            extend Sinatra::AssetSnack::InstanceMethods
+            Sinatra::AssetSnack.assets.each do |assets|
+              path = File.join(Bait.public, assets[:route])
+              File.open(path, 'w') do |file|
+                file.write compile(assets[:paths])[:body]
+              end
+            end
+          end
+        end
+      end.new
+    end
+  end
+end

data/lib/bait/cli.rb

@@ -12,6 +12,9 @@ module Bait
     # Start the server
     def self.server
       puts "** Bait/#{Bait::VERSION} booting up in #{Bait.env} environment"
+      if Bait.env == "production" && Bait.assets.missing?
+        Bait.assets.precompile
+      end
       require 'bait/api'
       Bait::Api.run!
     end

data/lib/bait/views/layout.haml

@@ -8,8 +8,9 @@
     %script{src:'/js/ansi2html.js'}
     %script{src:'/js/application.js'}
   %body
-    #nav
-      %a{href:'/'}Home
     #content
       = yield
+    %hr
+    #footer
+      %center Bait/#{Bait::VERSION} #{Bait.env}
 

data/spec/lib/bait_spec.rb

@@ -1,7 +1,39 @@
 require 'spec_helper'
+require 'bait'
 
 describe Bait do
   it 'should have a version number' do
     Bait::VERSION.should_not be_nil
   end
+
+  describe "#public" do
+    it "returns a Pathname" do
+      Bait.public.should be_a Pathname
+    end
+    it "returns the app public path" do
+      Bait.public.to_s.split('/').last.should eq "public"
+    end
+    it "returns a real path" do
+      Bait.public.should exist
+    end
+  end
+
+  describe "#assets" do
+    describe "#missing?" do
+      subject { Bait.assets }
+      context "when assets are missing" do
+        before do
+          Bait.assets.remove!
+        end
+        it { should be_missing }
+      end
+      context "when assets are compiled" do
+        before do
+          Bait.assets.remove!
+          Bait.assets.compile!
+        end
+        it { should_not be_missing }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bait
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Keyvan Fatehi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,6 +261,7 @@ files:
 - bin/bait
 - lib/bait.rb
 - lib/bait/api.rb
+- lib/bait/assets.rb
 - lib/bait/build.rb
 - lib/bait/build_helper.rb
 - lib/bait/cli.rb
@@ -307,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: build and integration test service