Commit 9e0212ab authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge branch 'static-gemspec' of github.com:lgierth/fnordmetrici - closes #41

Conflicts:
	Gemfile.lock
	VERSION
	fnordmetric.gemspec
parents 34b78acb 1713f4ce
Loading
Loading
Loading
Loading
+4 −19
Original line number Diff line number Diff line
source "http://rubygems.org"
source :rubygems

gemspec

gem "bson_ext", ">= 1.4.0"
gem "sinatra", ">= 1.2.6"
gem "redis", ">= 2.2.2"
gem "eventmachine"
gem "em-hiredis"
gem "json"
gem "i18n"
gem "haml"
gem "rack"
gem "rack-test"
gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"
gem "thin"
gem "activesupport"

group :development do  
  gem "delorean", ">= 0" 
  gem "rspec", "~> 2.6.0"
  gem "shoulda", ">= 0"
  gem "jeweler", "~> 1.5.2"
end
gem "rake"
+1 −23
Original line number Diff line number Diff line
require 'rubygems'
require 'bundler'
begin
  Bundler.setup(:default, :development)
rescue Bundler::BundlerError => e
  $stderr.puts e.message
  $stderr.puts "Run `bundle install` to install missing gems"
  exit e.status_code
end
require 'rake'

require 'jeweler'
Jeweler::Tasks.new do |gem|
  gem.name = "fnordmetric"
  gem.homepage = "http://github.com/paulasmuth/fnordmetric"
  gem.license = "MIT"
  gem.summary = "FnordMetric is a Ruby Event-Tracking gem on steroids"
  gem.description = "FnordMetric is a Ruby Event-Tracking gem on steroids"
  gem.email = "paul@paulasmuth.com"
  gem.authors = ["Paul Asmuth"]
end

require 'rspec'
require 'rspec/core/rake_task'
desc "Run all examples"

VERSION

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
0.6.4
+39 −6
Original line number Diff line number Diff line
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
$:.push File.expand_path("../lib", __FILE__)
require "fnordmetric/version"

Gem::Specification.new do |s|
<<<<<<< HEAD
  s.name = %q{fnordmetric}
  s.version = "0.6.4"

@@ -99,10 +99,38 @@ Gem::Specification.new do |s|
    "spec/widget_spec.rb",
    "spec/worker_spec.rb"
  ]
=======
  s.name        = "fnordmetric"
  s.version     = FnordMetric::VERSION
  s.date        = Date.today.to_s
  s.platform    = Gem::Platform::RUBY
  s.authors     = ["Paul Asmuth"]
  s.email       = ["paul@paulasmuth.com"]
  s.homepage    = "http://github.com/paulasmuth/fnordmetric"
  s.summary     = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
  s.description = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
  s.licenses    = ["MIT"]
  
  if s.respond_to? :specification_version then
    s.specification_version = 3
  s.add_dependency "bson_ext", ">= 1.4.0"
  s.add_dependency "sinatra", ">= 1.2.6"
  s.add_dependency "redis", ">= 2.2.2"
  s.add_dependency "eventmachine"
  s.add_dependency "em-hiredis"
  s.add_dependency "json"
  s.add_dependency "i18n"
  s.add_dependency "haml"
  s.add_dependency "rack"
  s.add_dependency "rack-test"
  s.add_dependency "yajl-ruby"
  s.add_dependency "thin"
  s.add_dependency "activesupport"
>>>>>>> 1713f4ce7384adae42df7c620e66d5bacf589bd3

  s.add_development_dependency "delorean"
  s.add_development_dependency "rspec", "~> 2.6.0"
  s.add_development_dependency "shoulda"

<<<<<<< HEAD
    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
      s.add_runtime_dependency(%q<bson_ext>, [">= 1.4.0"])
      s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
@@ -159,5 +187,10 @@ Gem::Specification.new do |s|
    s.add_dependency(%q<shoulda>, [">= 0"])
    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
  end
=======
  s.files         = `git ls-files`.split("\n") - [".gitignore", ".rspec", ".travis.yml"]
  s.test_files    = `git ls-files -- spec/*`.split("\n")
  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
  s.require_paths = ["lib"]
>>>>>>> 1713f4ce7384adae42df7c620e66d5bacf589bd3
end
+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ require 'sinatra/base'
require 'haml'
require 'thin'

require "fnordmetric/version"

module FnordMetric

  @@namespaces = {}
Loading