Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #50 from sodabrew/no_jeweler

Remove jeweler. Add tzinfo. Update gems.
  • Loading branch information...
commit 3800c7f25b077bb5bb86dda6207f595dc9574273 2 parents dbcf009 + 260070b
@sodabrew sodabrew authored
View
36 .gitignore
@@ -10,39 +10,3 @@ doc
# bundler
.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc
View
11 Gemfile
@@ -1,14 +1,3 @@
source "http://rubygems.org"
gemspec
-
-gem 'formtastic', "~> 2.2"
-
-group :development, :test do
- gem "ammeter"
- gem "rspec-rails", "~> 2.8.0"
- gem "bundler"
- gem "jeweler"
- gem "rcov", ">= 0"
- gem "rspec_tag_matchers"
-end
View
104 Gemfile.lock
@@ -1,91 +1,60 @@
PATH
remote: .
specs:
- formtastic-bootstrap (1.2.0)
- formtastic
- rails (>= 3.1.0)
+ formtastic-bootstrap (2.0.1pre)
+ formtastic (~> 2.2)
+ formtastic-bootstrap
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
- mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
- ammeter (0.2.4)
+ ammeter (0.2.8)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (>= 2.2)
rspec-rails (>= 2.2)
- arel (3.0.2)
- builder (3.0.0)
+ builder (3.0.4)
diff-lcs (1.1.3)
erubis (2.7.0)
- formtastic (2.2.0)
+ formtastic (2.2.1)
actionpack (>= 3.0)
- git (1.2.5)
hike (1.2.1)
- i18n (0.6.0)
- jeweler (1.6.4)
- bundler (~> 1.0)
- git (>= 1.2.5)
- rake
- journey (1.0.3)
- json (1.7.3)
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.3.6)
- nokogiri (1.5.3)
- polyglot (0.3.3)
- rack (1.4.1)
+ i18n (0.6.1)
+ journey (1.0.4)
+ json (1.7.6)
+ multi_json (1.5.0)
+ nokogiri (1.5.6)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
- bundler (~> 1.0)
- railties (= 3.2.3)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
+ thor (>= 0.14.6, < 2.0)
+ rake (0.9.6)
rcov (0.9.11)
rdoc (3.12)
json (~> 1.4)
@@ -105,27 +74,24 @@ GEM
rspec_tag_matchers (1.0.0)
nokogiri (>= 1.4.0)
rspec-rails (>= 1.2.6)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.14.6)
+ thor (0.17.0)
tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
PLATFORMS
ruby
DEPENDENCIES
ammeter
- bundler
- formtastic (~> 2.2)
+ bundler (~> 1.2)
formtastic-bootstrap!
- jeweler
- rcov
- rspec
+ rake (< 1.0)
+ rcov (< 1.0)
rspec-rails (~> 2.8.0)
rspec_tag_matchers
+ tzinfo
View
18 Rakefile
@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
- # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
- gem.name = "formtastic-bootstrap"
- gem.homepage = "http://github.com/mjbellantoni/formtastic-bootstrap"
- gem.license = "MIT"
- gem.summary = %Q{Formtastic form builder to generate Twitter Bootstrap-friendly markup.}
- gem.description = gem.summary
- gem.email = "mjbellantoni@yahoo.com"
- gem.authors = ["Matthew Bellantoni"]
- # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
require 'rspec/core'
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -39,9 +25,9 @@ end
task :default => :spec
require 'rdoc/task'
+require File.expand_path('../lib/formtastic-bootstrap/version', __FILE__)
Rake::RDocTask.new do |rdoc|
- version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
+ version = FormtasticBootstrap::VERSION
rdoc.rdoc_dir = 'rdoc'
rdoc.title = "formtastic-bootstrap #{version}"
rdoc.rdoc_files.include('README*')
View
160 formtastic-bootstrap.gemspec
@@ -1,166 +1,38 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/formtastic-bootstrap/version', __FILE__)
Gem::Specification.new do |s|
s.name = "formtastic-bootstrap"
- s.version = "2.0.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.version = FormtasticBootstrap::VERSION
s.authors = ["Matthew Bellantoni"]
- s.date = "2012-09-05"
- s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
s.email = "mjbellantoni@yahoo.com"
+ s.homepage = "http://github.com/mjbellantoni/formtastic-bootstrap"
+ s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
+ s.summary = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
s.extra_rdoc_files = [
"LICENSE.txt",
"README.md"
]
- s.files = [
+ s.files = Dir[
".document",
- ".rspec",
- "Gemfile",
- "Gemfile.lock",
"LICENSE.txt",
"README.md",
- "Rakefile",
"VERSION",
- "formtastic-bootstrap.gemspec",
- "lib/action_view/helpers/text_field_date_helper.rb",
- "lib/formtastic-bootstrap.rb",
- "lib/formtastic-bootstrap/actions.rb",
- "lib/formtastic-bootstrap/actions/base.rb",
- "lib/formtastic-bootstrap/actions/button_action.rb",
- "lib/formtastic-bootstrap/actions/input_action.rb",
- "lib/formtastic-bootstrap/actions/link_action.rb",
- "lib/formtastic-bootstrap/engine.rb",
- "lib/formtastic-bootstrap/form_builder.rb",
- "lib/formtastic-bootstrap/helpers.rb",
- "lib/formtastic-bootstrap/helpers/action_helper.rb",
- "lib/formtastic-bootstrap/helpers/actions_helper.rb",
- "lib/formtastic-bootstrap/helpers/fieldset_wrapper.rb",
- "lib/formtastic-bootstrap/helpers/input_helper.rb",
- "lib/formtastic-bootstrap/helpers/inputs_helper.rb",
- "lib/formtastic-bootstrap/inputs.rb",
- "lib/formtastic-bootstrap/inputs/base.rb",
- "lib/formtastic-bootstrap/inputs/base/choices.rb",
- "lib/formtastic-bootstrap/inputs/base/collections.rb",
- "lib/formtastic-bootstrap/inputs/base/errors.rb",
- "lib/formtastic-bootstrap/inputs/base/grouped_collections.rb",
- "lib/formtastic-bootstrap/inputs/base/hints.rb",
- "lib/formtastic-bootstrap/inputs/base/html.rb",
- "lib/formtastic-bootstrap/inputs/base/labelling.rb",
- "lib/formtastic-bootstrap/inputs/base/numeric.rb",
- "lib/formtastic-bootstrap/inputs/base/stringish.rb",
- "lib/formtastic-bootstrap/inputs/base/timeish.rb",
- "lib/formtastic-bootstrap/inputs/base/wrapping.rb",
- "lib/formtastic-bootstrap/inputs/boolean_input.rb",
- "lib/formtastic-bootstrap/inputs/check_boxes_input.rb",
- "lib/formtastic-bootstrap/inputs/date_input.rb",
- "lib/formtastic-bootstrap/inputs/date_select_input.rb",
- "lib/formtastic-bootstrap/inputs/datetime_input.rb",
- "lib/formtastic-bootstrap/inputs/datetime_select_input.rb",
- "lib/formtastic-bootstrap/inputs/email_input.rb",
- "lib/formtastic-bootstrap/inputs/file_input.rb",
- "lib/formtastic-bootstrap/inputs/hidden_input.rb",
- "lib/formtastic-bootstrap/inputs/number_input.rb",
- "lib/formtastic-bootstrap/inputs/password_input.rb",
- "lib/formtastic-bootstrap/inputs/phone_input.rb",
- "lib/formtastic-bootstrap/inputs/radio_input.rb",
- "lib/formtastic-bootstrap/inputs/range_input.rb",
- "lib/formtastic-bootstrap/inputs/search_input.rb",
- "lib/formtastic-bootstrap/inputs/select_input.rb",
- "lib/formtastic-bootstrap/inputs/string_input.rb",
- "lib/formtastic-bootstrap/inputs/text_input.rb",
- "lib/formtastic-bootstrap/inputs/time_input.rb",
- "lib/formtastic-bootstrap/inputs/time_select_input.rb",
- "lib/formtastic-bootstrap/inputs/time_zone_input.rb",
- "lib/formtastic-bootstrap/inputs/url_input.rb",
- "spec/actions/button_action_spec.rb",
- "spec/actions/input_action_spec.rb",
- "spec/actions/link_action_spec.rb",
- "spec/builder/semantic_fields_for_spec.rb",
- "spec/helpers/action_helper_spec.rb",
- "spec/helpers/actions_helper_spec.rb",
- "spec/helpers/input_helper_spec.rb",
- "spec/helpers/inputs_helper_spec.rb",
- "spec/inputs/boolean_input_spec.rb",
- "spec/inputs/check_boxes_input_spec.rb",
- "spec/inputs/date_select_input_spec.rb",
- "spec/inputs/datetime_select_input_spec.rb",
- "spec/inputs/deprecated_time_date_datetime_inputs_spec.rb",
- "spec/inputs/email_input_spec.rb",
- "spec/inputs/file_input_spec.rb",
- "spec/inputs/hidden_input_spec.rb",
- "spec/inputs/number_input_spec.rb",
- "spec/inputs/password_input_spec.rb",
- "spec/inputs/phone_input_spec.rb",
- "spec/inputs/radio_input_spec.rb",
- "spec/inputs/range_input_spec.rb",
- "spec/inputs/search_input_spec.rb",
- "spec/inputs/select_input_spec.rb",
- "spec/inputs/string_input_spec.rb",
- "spec/inputs/text_input_spec.rb",
- "spec/inputs/time_select_input_spec.rb",
- "spec/inputs/time_zone_input_spec.rb",
- "spec/inputs/url_input_spec.rb",
- "spec/spec_helper.rb",
- "spec/support/custom_macros.rb",
- "spec/support/fb_custom_macros.rb",
+ "lib/**",
"vendor/assets/stylesheets/formtastic-bootstrap.css"
]
- s.homepage = "http://github.com/mjbellantoni/formtastic-bootstrap"
s.licenses = ["MIT"]
s.require_paths = ["lib"]
s.rubygems_version = "1.8.10"
- s.summary = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
- if s.respond_to? :specification_version then
- s.specification_version = 3
+ s.add_dependency('formtastic-bootstrap', [">= 0"])
+ s.add_dependency('formtastic', ["~> 2.2"])
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<formtastic-bootstrap>, [">= 0"])
- s.add_runtime_dependency(%q<formtastic>, ["~> 2.2"])
- s.add_development_dependency(%q<rspec>, [">= 0"])
- s.add_development_dependency(%q<bundler>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_development_dependency(%q<rcov>, [">= 0"])
- s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
- s.add_development_dependency(%q<ammeter>, [">= 0"])
- s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.0"])
- s.add_development_dependency(%q<bundler>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_development_dependency(%q<rcov>, [">= 0"])
- s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
- else
- s.add_dependency(%q<formtastic-bootstrap>, [">= 0"])
- s.add_dependency(%q<formtastic>, ["~> 2.2"])
- s.add_dependency(%q<rspec>, [">= 0"])
- s.add_dependency(%q<bundler>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rcov>, [">= 0"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
- s.add_dependency(%q<ammeter>, [">= 0"])
- s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
- s.add_dependency(%q<bundler>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rcov>, [">= 0"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
- end
- else
- s.add_dependency(%q<formtastic-bootstrap>, [">= 0"])
- s.add_dependency(%q<formtastic>, ["~> 2.2"])
- s.add_dependency(%q<rspec>, [">= 0"])
- s.add_dependency(%q<bundler>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rcov>, [">= 0"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
- s.add_dependency(%q<ammeter>, [">= 0"])
- s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
- s.add_dependency(%q<bundler>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rcov>, [">= 0"])
- s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
- end
+ s.add_development_dependency('ammeter', [">= 0"])
+ s.add_development_dependency('bundler', ["~> 1.2"])
+ s.add_development_dependency('rake', ["< 1.0"])
+ s.add_development_dependency('rcov', ["< 1.0"])
+ s.add_development_dependency('rspec-rails', ["~> 2.8.0"])
+ s.add_development_dependency('rspec_tag_matchers', [">= 0"])
+ s.add_development_dependency('tzinfo')
end
View
3  lib/formtastic-bootstrap/version.rb
@@ -0,0 +1,3 @@
+module FormtasticBootstrap
+ VERSION = "2.0.1pre"
+end
Please sign in to comment.
Something went wrong with that request. Please try again.