big_band 0.2.3 → 0.2.4

data/README.rdoc

@@ -1,4 +1,4 @@
-= BigBand 0.2.3
+= BigBand 0.2.4
 BigBand is a collection of Sinatra extensions and offers better sinatra integration for common tools.
 It is pluggable and each extension can be used in stand alone mode.
 

data/Rakefile

@@ -1,3 +1,13 @@
+$LOAD_PATH.unshift "lib"
+load "depgen/depgen.task"
+
+if ENV['RUN_CODE_RUN']
+  Rake::Task["dependencies:vendor:all"].invoke
+  task :default => :spec
+else
+  task :default => [:dummy_files, "dependencies:generate:rip", :gems] # gems will trigger spec
+end
+
 $LOAD_PATH.unshift(*Dir.glob(File.expand_path(__FILE__ + "/../vendor/*/lib")))
 require "erb"
 require "spec/rake/spectask"
@@ -11,12 +21,9 @@ require "big_band/integration/yard"
 require "big_band/integration/rake"
 require "big_band/version"
 
-load __FILE__.dirname.expand_path / "dependencies.rb"
-
 include BigBand::Integration::Rake
 RoutesTask.new { |t| t.source = "lib/**/*.rb" }
 
-task :default => [:dummy_files, :rip, :gems] # gems will trigger spec
 task :install => "gems:install"
 task :test    => :spec
 task :clobber => "doc:clobber_rdoc"
@@ -114,33 +121,6 @@ namespace :gems do
 
 end
 
-task :rip => "rip:generate"
-namespace :rip do
-  desc "generates deps.rip"
-  task :generate do
-    BigBand::Dependencies.for_rip "deps.rip"
-  end
-end
-
-desc "clone all dependencies to vendor"
-task :vendor => "vendor:all"
-namespace :vendor do
-  task :all
-  BigBand::Dependencies.each do |dep|
-    target = "vendor" / dep.name
-    task :all => dep.name
-    desc "clone #{dep.name} #{dep.version} to #{target}"
-    task dep.name do
-      mkdir_p "vendor"
-      sh "git clone #{dep.git} #{target}" unless target.file_exists?
-      chdir(target) do
-        sh "git pull"
-        sh "git checkout #{dep.git_ref}"
-      end
-    end
-  end
-end
-
 desc "generate dummy files"
 task :dummy_files do |t|
   chdir "lib" do
@@ -160,7 +140,13 @@ end
 desc "make a release, will fail if there are uncommitted changes or the specs don't pass"
 task :release => "release:gem"
 namespace :release do
-  task(:committed) { raise "uncommitted changes" unless %x[git status] =~ /nothing to commit/ }
+
+  task(:committed) do
+    status = %x[git status]
+    raise "uncommitted changes" unless status =~ /nothing to commit/
+    raise "not on branch master" unless status =~ /On branch master\n/
+  end
+
   task :version_bump => [:spec, :committed] do
     new_version = ENV["VERSION"] || BigBand::VERSION.gsub(/\.(\d+)$/) { ".#{$1.to_i + 1}" }
     old_source = File.read "lib/big_band/version.rb"
@@ -172,9 +158,18 @@ namespace :release do
     puts "version bump: #{BigBand::VERSION} -> #{new_version}'"
     BigBand::VERSION.replace new_version
   end
-  task :prepare => [:version_bump, :rip, :clobber, "doc:readme", "gems:build"]
-  task(:git => :prepare) { sh "git ci -am 'release: #{BigBand::VERSION}' && git push" }
+
+  task :prepare => [:version_bump, "dependencies:generate:rip", :clobber, "doc:readme", "gems:build"]
+
+  task :git => :prepare do
+    message = "-m 'release: #{BigBand::VERSION}'"
+    sh "git ci -a #{message}"
+    sh "git tag -a v#{BigBand::VERSION} #{message}"
+    sh "git push && git push --tags"
+  end
+
   task :gem => [:git, "gems:push"]
+
 end
 
 ############
@@ -193,5 +188,3 @@ namespace :g do
   task :i => "gems:install"
   task :p => "gems:push"
 end
-task :r => :rip
-namespace(:r) { task :g => "rip:generate" }

data/big_band.gemspec

@@ -18,7 +18,7 @@ SPEC = Gem::Specification.new do |s|
   s.description   = s.summary + " See README.rdoc for more infos."
   s.rdoc_options  = %w[-a -S -N -m README.rdoc -q -w 2 -t BigBand -c UTF-8]
 
-  BigBand::Dependencies.for_gemspec(s)
+  Dependencies.setup_gem(s)
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/dependencies.rb

@@ -1,44 +1,12 @@
-# Manages dependencies for different package management systems in a single place (I like to experiment).
-dependencies = proc do
-  dep "compass",    :git => "git://github.com/chriseppstein/compass.git", :version => "0.8.17", :git_ref => "v%s"
-  dep "monkey-lib", :git => "git://github.com/rkh/monkey-lib.git",        :version => "0.3.2",  :git_ref => "v%s"
-  dep "rack",       :git => "git://github.com/rack/rack.git",             :version => "1.0.1",  :only    => :rip
-  dep "rack-test",  :git => "git://github.com/brynary/rack-test.git",     :version => "0.5.3",  :git_ref => "v%s"
-  dep "sinatra",    :git => "git://github.com/sinatra/sinatra.git",       :version => "0.9.4"
-  dep "yard",       :git => "git://github.com/lsegal/yard.git",           :version => "0.5.2"
+require "depgen/depgen"
+
+class Dependencies < Depgen
+  add "compass",    :git => "git://github.com/chriseppstein/compass.git", :version => "0.8.17", :git_ref => "v%s"
+  add "haml",       :git => "git://github.com/nex3/haml.git",             :version => "2.2.17", :only    => :rip
+  add "monkey-lib", :git => "git://github.com/rkh/monkey-lib.git",        :version => "0.3.5",  :git_ref => "v%s"
+  add "rack",       :git => "git://github.com/rack/rack.git",             :version => "1.0.1",  :only    => :rip
+  add "rack-test",  :git => "git://github.com/brynary/rack-test.git",     :version => "0.5.3",  :git_ref => "v%s"
+  add "rspec",      :git => "git://github.com/dchelimsky/rspec.git",      :version => "1.3.0"
+  add "sinatra",    :git => "git://github.com/sinatra/sinatra.git",       :version => "0.9.4"
+  add "yard",       :git => "git://github.com/lsegal/yard.git",           :version => "0.5.2"
 end
-
-require "ostruct"
-require "big_band/integration" unless defined? BigBand
-
-module BigBand::Dependencies
-  @deps = {}
-  extend Enumerable
-
-  def self.dep(name = nil, data = {})
-    return(@deps[name] ||= OpenStruct.new) if data.empty?
-    data[:git_ref] ||= data[:version]
-    data[:only]    ||= [:rip, :gem]
-    data[:name]    ||= name
-    data[:only]      = [data[:only]] unless data[:only].is_a? Array
-    data[:git_ref]   = data[:git_ref] % data[:version]
-    @deps[name]      = OpenStruct.new data
-  end
-
-  def self.for_gemspec(s)
-    each { |d| s.add_dependency d.name, ">= #{d.version}" }
-  end
-
-  def self.for_rip(file = nil)
-    if file then File.open(file, "w") { |f| f << for_rip }
-    else select { |d| d.only.include? :rip }.map { |d| "#{d.git} #{d.git_ref}\n"}.join
-    end
-  end
-
-  def self.each(&block)
-    @deps.each_value(&block)
-  end
-
-end
-
-BigBand::Dependencies.class_eval(&dependencies)

data/depgen/README.rdoc

@@ -0,0 +1,7 @@
+= Depgen
+This code has been extracted from BigBand.
+
+TODO: Describe what it does.
+
+== Why is there no lib folder?
+Cause this is not meant to live in your $LOAD_PATH.

data/depgen/Rakefile

@@ -0,0 +1,23 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+task :default => :rspec
+
+spec_def = lambda do |t|
+  t.spec_files = ["depgen_spec.rb"]
+  t.rcov_opts  = %w[--exclude spec,rcov]
+  t.spec_opts  = %w[-c --format progress --loadby mtime --reverse]
+  t.libs       = [File.expand_path(File.dirname(__FILE__))]
+end
+
+desc "Run all examples with RSpec"
+Spec::Rake::SpecTask.new('rspec', &spec_def)
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('rcov') do |t|
+  spec_def[t]
+  t.rcov = true
+end
+
+desc "Run all examples with MSpec"
+task(:mspec) { sh "mspec-run depgen_spec.rb" }

data/depgen/depgen.rb

@@ -0,0 +1,123 @@
+require "fileutils"
+
+class Depgen
+
+  SETUP_TOOLS = [:bundler, :gem, :monk, :rip, :vendor]
+
+  class << self
+    include Enumerable
+    attr_reader :all, :option_stack
+
+    def default_options
+      @option_stack.inject({}) { |a, b| a.merge b }
+    end
+
+    def each(&block)
+      all.values.each(&block)
+    end
+
+    def github(user, project = nil, options = {}, &block)
+      raise "cannot call github within #{@wrapper}" if @wrapper and @wrapper != :github
+      project ||= {}
+      if block
+        @user, @wrapper, wrapper_was, user_was = user, :github, @wrapper, @user
+        result = with_options(options.merge(project), &block)
+        @user, @wrapper = user_was, wrapper_was
+      elsif @wrapper
+        wrapper_was, @wrapper = @wrapper, nil
+        result = send :github, @user, user, options.merge(project)
+        @wrapper = wrapper_was
+      else
+        raise ArgumentError, "no project given" if project.nil? or project.is_a? Hash
+        result = new project, options.merge(:git => "git://github.com/#{user}/#{project}.git")
+      end
+      result
+    end
+
+    def inherited(klass)
+      super
+      klass.set_defaults
+    end
+
+    def new(name, options = {})
+      return send(@wrapper, name, options) if @wrapper
+      result = (all[name] ||= super()).apply default_options.merge(options).merge(:name => name)
+      yield result if block_given?
+      @stack << result if @stack
+      result
+    end
+
+    alias add new
+    alias [] new
+
+    def set_defaults
+      @all ||= {}
+      @option_stack ||= []
+    end
+
+    def with_options(options = {})
+      @stack, stack_was = [], @stack
+      @option_stack.push options
+      yield(self)
+      @stack, result = stack_was, @stack
+      @stack.push(*result) if @stack
+      @option_stack.pop
+      result
+    end
+
+    SETUP_TOOLS.each do |tool|
+      eval "def setup_#{tool}(*args); each { |e| e.setup_#{tool}(*args) if e.only.include? #{tool.inspect} }; end"
+    end
+  end
+
+  set_defaults
+  attr_accessor :name, :git, :version, :git_ref, :gem_comp, :only
+
+  def apply(options = {})
+    options.each { |k,v| send "#{k}=", v }
+    self
+  end
+
+  def git_ref
+    version ? @git_ref % version : "HEAD"
+  end
+
+  def initialize
+    super
+    apply :git_ref => "%s", :only => SETUP_TOOLS, :gem_comp => ">="
+  end
+  
+  def only
+    [@only].flatten
+  end
+
+  def setup_bundler(bundler, options = {})
+    bundler.gem(name, version, {:git => git, :ref => git_ref, :require_as => nil}.merge(options))
+  end
+
+  def setup_gem(spec)
+    spec.add_dependency name, "#{gem_comp} #{version}"
+  end
+
+  def setup_monk(output)
+    output.puts [name, gem_comp, version, git].compact.join(" ")
+  end
+
+  def setup_rip(output)
+    output.puts "#{git} #{git_ref}"
+  end
+
+  def setup_vendor(dir = "vendor", verbose = true, &run_cmd)
+    util = verbose ? FileUtils::Verbose : FileUtils
+    run_cmd ||= proc { |cmd| exit 1 unless system cmd }
+    util.mkdir_p dir
+    util.chdir(dir) do
+      run_cmd["git clone #{git} #{name}"] unless File.exist? name
+      util.chdir(name) do
+        run_cmd["git checkout master && git pull"]
+        run_cmd["git checkout #{git_ref}"]
+      end
+    end
+  end
+
+end

data/depgen/depgen.task

@@ -0,0 +1,42 @@
+DEP_FILE  = ENV["DEP_FILE"]  || "dependencies.rb" unless defined? DEP_FILE
+DEP_CLASS = ENV["DEP_CLASS"] || "Dependencies"    unless defined? DEP_CLASS
+
+unless File.exist? DEP_FILE
+  File.open(DEP_FILE, "w") do |f|
+    f.puts 'require "depgen/depgen"', "class #{DEP_CLASS} < Depgen", "end"
+  end
+end
+
+def dep_generate(name, file, &block)
+  desc "generate #{name} configuration"
+  task(name) { File.open(file, "w", &block)}
+end
+
+load DEP_FILE
+DEPENDENCIES = Object.const_get DEP_CLASS
+
+namespace :dependencies do
+
+  namespace :vendor do
+    desc "unpack all dependencies in vendor/"
+    task(:all) { DEPENDENCIES.setup_vendor { |cmd| sh cmd } }
+    DEPENDENCIES.each do |dep|
+      desc "unpack #{dep.name} #{dep.version} in vendor/#{dep.name}/"
+      task(dep.name) { dep.setup_vendor { |cmd| sh cmd } }
+    end
+  end
+
+  namespace :generate do
+    dep_generate(:rip, "deps.rip") { |f| DEPENDENCIES.setup_rip(f) }
+    dep_generate(:bundler, "Gemfile") { |f| f.puts "load #{DEP_FILE.inspect}", "#{DEP_CLASS}.setup_bunlder(self)" }
+    dep_generate(:monk, "dependencies") {|f| DEPENDENCIES.setup_rip(f) }
+  end
+
+  desc "list all dependencies"
+  task :list do
+    DEPENDENCIES.each do |dep|
+      puts "#{dep.name} #{dep.version}"
+    end
+  end
+
+end

data/depgen/depgen_spec.rb

@@ -0,0 +1,127 @@
+require "depgen"
+require "fileutils"
+include FileUtils
+
+
+TEMP_DIR = File.join File.dirname(__FILE__), "tmp"
+TEMP_DIR.replace SPEC_TEMP_DIR if defined? SPEC_TEMP_DIR and SPEC_TEMP_DIR
+mkdir_p TEMP_DIR
+
+describe Depgen do
+
+  def depgen(&block)
+    Class.new(Depgen, &block)
+  end
+
+  before { @dep = depgen }
+
+  describe :default_options do
+
+    it "is empty per default" do
+      @dep.default_options.should be_empty
+    end
+
+    it "contains elements from the option stack" do
+      @dep.option_stack.push :foo => 10, :bar => 23
+      @dep.default_options[:foo].should == 10
+      @dep.option_stack.push :foo => 42
+      @dep.default_options[:foo].should == 42
+      @dep.default_options[:bar].should == 23
+      @dep.option_stack.pop
+      @dep.default_options[:foo].should == 10
+    end
+
+  end
+
+  describe :each do
+
+    before do
+      @foo = @dep.add "foo"
+      @bar = depgen.add "bar"
+    end
+
+    it "yields through directly created dependencies" do
+      @dep.each { |d| d.should == @foo }
+    end
+
+    it "yields not through dependencies from other subclasses" do
+      @dep.each { |d| d.should != @foo }
+    end
+
+  end
+
+  describe :github do
+
+    it "sets up git url correctly" do
+      @dep.github("rkh", "depgen").git.should  == "git://github.com/rkh/depgen.git"
+    end
+
+    it "takes a block so you don't have to repeat yourself" do
+      @dep.github("rkh") do |d|
+        d.add("depgen").git.should  == "git://github.com/rkh/depgen.git"
+        d.add("big_band").git.should  == "git://github.com/rkh/big_band.git"
+      end
+    end
+
+  end
+
+  describe "#git_ref" do
+
+    it "equals version per default" do
+      @dep.add("foo", :version => "bar").git_ref == "bar"
+    end
+
+    it "subistutes %s with version" do
+      @dep.add("foo", :version => "bar", :git_ref => "foo%sbaz").git_ref == "foobarbaz"
+    end
+
+  end
+
+  describe "#setup_bundler" do
+    it "uses Bundler's gem to set up dependencies" do
+      @dep.add "foo", :version => "1.0", :git => "bar"
+      bundler = mock("bundler")
+      bundler.should_receive(:gem).once.with "foo", "1.0", hash_including(:git => "bar", :require_as => nil, :foo => :bar)
+      @dep.setup_bundler bundler, :foo => :bar
+    end
+  end
+
+  describe "#setup_gem" do
+    it "uses gemspec method add_dependency" do
+      @dep.add "foo", :version => "1.0", :gem_comp => ">="
+      gemspec = mock("gemspec")
+      gemspec.should_receive(:add_dependency).once.with "foo", ">= 1.0"
+      @dep.setup_gem gemspec
+    end
+  end
+
+  describe "#setup_monk" do
+    it "produces valid lines" do
+      @dep.add "foo", :version => "1.0", :git => "bar", :gem_comp => ">="
+      out = StringIO.new
+      @dep.setup_monk out
+      out.rewind
+      out.read.should == "foo >= 1.0 bar\n"
+    end
+  end
+
+  describe "#setup_rip" do
+    it "produces valid lines" do
+      @dep.add "foo", :version => "1.0", :git => "bar", :gem_comp => ">="
+      out = StringIO.new
+      @dep.setup_rip out
+      out.rewind
+      out.read.should == "bar 1.0\n"
+    end
+  end
+
+  describe "#setup_vendor" do
+    it "populates the given vendor directory" do
+      @dep.github "rkh", "big_band", :git_ref => "HEAD"
+      @dep.setup_vendor "#{TEMP_DIR}/vendor"
+      File.directory?("#{TEMP_DIR}/vendor/big_band").should be_true
+      rm_rf "#{TEMP_DIR}/vendor"
+    end  
+  end
+
+end

data/deps.rip

@@ -1,6 +1,8 @@
 git://github.com/chriseppstein/compass.git v0.8.17
+git://github.com/nex3/haml.git 2.2.17
 git://github.com/lsegal/yard.git 0.5.2
-git://github.com/rkh/monkey-lib.git v0.3.2
+git://github.com/dchelimsky/rspec.git 1.3.0
+git://github.com/rkh/monkey-lib.git v0.3.5
 git://github.com/rack/rack.git 1.0.1
 git://github.com/sinatra/sinatra.git 0.9.4
 git://github.com/brynary/rack-test.git v0.5.3

data/lib/big_band/compass.rb

@@ -45,7 +45,7 @@ class BigBand < Sinatra::Base
           content_type 'text/css', :charset => 'utf-8'
           compass :"#{path}/#{params[:name]}"
         end
-        set :compass, :sass_dir => klass.views / path unless compass[:sass_dir] && compass[:sass_dir].directory?
+        set :compass, :sass_dir => views / path unless compass[:sass_dir] && compass[:sass_dir].directory?
         @compass_route.deactivate if @compass_route
         @compass_route = get("/#{path}" / ":name.css", &block)
       end

data/lib/big_band/integration/rake.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "big_band/integration"
 require "rake"
 require "rake/tasklib"

data/lib/big_band/more_server/unicorn.rb

@@ -12,7 +12,6 @@ class BigBand < Sinatra::Base
           # TODO: env dependend stuff.
           use Rack::CommonLogger, $stderr
           use Rack::ShowExceptions
-          use Rack::Lint
           run app
         end.to_app
         options[:Backend] ||= ::Unicorn

data/lib/big_band/reloader.rb

@@ -82,7 +82,7 @@ class BigBand < Sinatra::Base
         end
       end
 
-      def also_relaod(*files)
+      def also_reload(*files)
         files.flatten.each do |file|
           FileWatcher.new(file).dont_reload! false
         end

data/lib/big_band/version.rb

@@ -1,3 +1,3 @@
 require "big_band/integration" unless defined? BigBand
-BigBand::VERSION = "0.2.3"
-BigBand::DATE    = "2010-01-04"
+BigBand::VERSION = "0.2.4"
+BigBand::DATE    = "2010-01-24"

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 ENV['RACK_ENV'] = 'test'
 
-$LOAD_PATH.unshift(File.expand_path(__FILE__ + "../../lib"), *Dir.glob(File.expand_path(__FILE__ + "../../vendor/*/lib")))
+$LOAD_PATH.unshift(File.expand_path(__FILE__ + "/../../lib"), *Dir.glob(File.expand_path(__FILE__ + "/../../vendor/*/lib")))
 require "big_band/integration/rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: big_band
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +01:00
+date: 2010-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,24 +33,24 @@ dependencies:
         version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: monkey-lib
+  name: rspec
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: monkey-lib
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 0.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -83,6 +83,11 @@ extra_rdoc_files: []
 files: 
 - big_band.gemspec
 - dependencies.rb
+- depgen/depgen.rb
+- depgen/depgen.task
+- depgen/depgen_spec.rb
+- depgen/Rakefile
+- depgen/README.rdoc
 - deps.rip
 - example/example.rb
 - example/views/index.haml