From 98c50e4a2e9865f8d209ec8b4b9555a1cd6ca25d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 26 Apr 2011 11:59:33 -0400 Subject: [PATCH] Added bundler support --- .gitignore | 7 +++-- Gemfile | 4 +++ Gemfile.lock | 53 +++++++++++++++++++++++++++++++++ Rakefile | 35 ++-------------------- VERSION.yml | 5 ---- init.rb | 1 - lib/meta_tags.rb | 6 ++-- lib/meta_tags/version.rb | 3 ++ meta-tags.gemspec | 64 ++++++++++++---------------------------- spec/spec_helper.rb | 7 ++--- 10 files changed, 91 insertions(+), 94 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock delete mode 100644 VERSION.yml delete mode 100644 init.rb create mode 100644 lib/meta_tags/version.rb diff --git a/.gitignore b/.gitignore index 33194754..4b4aa71b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -rdoc +.yardoc +.DS_Store +.bundle +.rvmrc doc pkg -.yardoc -.DS_Store \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..0401b652 --- /dev/null +++ b/Gemfile @@ -0,0 +1,4 @@ +source 'http://rubygems.org' + +# Specify your gem's dependencies in meta-tags.gemspec +gemspec diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..53a516a8 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,53 @@ +PATH + remote: . + specs: + meta-tags (1.2.4) + actionpack + +GEM + remote: http://rubygems.org/ + specs: + abstract (1.0.0) + actionpack (3.0.7) + activemodel (= 3.0.7) + activesupport (= 3.0.7) + builder (~> 2.1.2) + erubis (~> 2.6.6) + i18n (~> 0.5.0) + rack (~> 1.2.1) + rack-mount (~> 0.6.14) + rack-test (~> 0.5.7) + tzinfo (~> 0.3.23) + activemodel (3.0.7) + activesupport (= 3.0.7) + builder (~> 2.1.2) + i18n (~> 0.5.0) + activesupport (3.0.7) + builder (2.1.2) + diff-lcs (1.1.2) + erubis (2.6.6) + abstract (>= 1.0.0) + i18n (0.5.0) + rack (1.2.2) + rack-mount (0.6.14) + rack (>= 1.0.0) + rack-test (0.5.7) + rack (>= 1.0) + rspec (2.5.0) + rspec-core (~> 2.5.0) + rspec-expectations (~> 2.5.0) + rspec-mocks (~> 2.5.0) + rspec-core (2.5.1) + rspec-expectations (2.5.0) + diff-lcs (~> 1.1.2) + rspec-mocks (2.5.0) + tzinfo (0.3.26) + yard (0.6.8) + +PLATFORMS + ruby + +DEPENDENCIES + meta-tags! + rspec + yard diff --git a/Rakefile b/Rakefile index ee1876f0..dc3c8150 100644 --- a/Rakefile +++ b/Rakefile @@ -1,36 +1,5 @@ -require 'rake' - -begin - require 'jeweler' - Jeweler::Tasks.new do |gemspec| - gemspec.name = 'meta-tags' - gemspec.summary = 'Collection of SEO helpers for Ruby on Rails' - gemspec.description = 'Search Engine Optimization (SEO) plugin for Ruby on Rails applications.' - gemspec.email = 'kpumuk@kpumuk.info' - gemspec.homepage = 'http://github.com/kpumuk/meta-tags' - gemspec.authors = ['Dmytro Shteflyuk'] - end - Jeweler::GemcutterTasks.new -rescue LoadError - puts 'Jeweler not available. Install it with: sudo gem install jeweler' -end - -begin - require 'spec/rake/spectask' - - desc 'Default: run specs' - task :default => :spec - - desc 'Test the sphinx plugin' - Spec::Rake::SpecTask.new do |t| - t.libs << 'lib' - t.pattern = 'spec/*_spec.rb' - t.verbose = true - t.spec_opts = ['-cfs'] - end -rescue LoadError - puts 'RSpec not available. Install it with: sudo gem install rspec' -end +require 'bundler' +Bundler::GemHelper.install_tasks begin require 'yard' diff --git a/VERSION.yml b/VERSION.yml deleted file mode 100644 index 35bd5d08..00000000 --- a/VERSION.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -:major: 1 -:minor: 2 -:build: -:patch: 3 diff --git a/init.rb b/init.rb deleted file mode 100644 index 47715b2f..00000000 --- a/init.rb +++ /dev/null @@ -1 +0,0 @@ -require 'meta_tags' diff --git a/lib/meta_tags.rb b/lib/meta_tags.rb index 97d865d9..f70a8546 100644 --- a/lib/meta_tags.rb +++ b/lib/meta_tags.rb @@ -2,9 +2,11 @@ require 'action_view' module MetaTags - autoload :ViewHelper, 'meta_tags/view_helper' - autoload :ControllerHelper, 'meta_tags/controller_helper' end +require 'meta_tags/version' +require 'meta_tags/view_helper' +require 'meta_tags/controller_helper' + ActionView::Base.send :include, MetaTags::ViewHelper ActionController::Base.send :include, MetaTags::ControllerHelper diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb new file mode 100644 index 00000000..9d88d82f --- /dev/null +++ b/lib/meta_tags/version.rb @@ -0,0 +1,3 @@ +module MetaTags + VERSION = '1.2.4' +end diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 5211757a..8c81df73 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -1,52 +1,26 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command # -*- encoding: utf-8 -*- +$:.push File.expand_path('../lib', __FILE__) +require 'meta_tags/version' Gem::Specification.new do |s| - s.name = %q{meta-tags} - s.version = "1.2.3" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Dmytro Shteflyuk"] - s.date = %q{2010-06-10} + s.name = 'meta-tags' + s.version = MetaTags::VERSION + s.platform = Gem::Platform::RUBY + s.authors = ['Dmytro Shteflyuk'] + s.email = ['kpumuk@kpumuk.info'] + s.homepage = 'http://github.com/kpumuk/meta-tags' + s.summary = %q{Collection of SEO helpers for Ruby on Rails.} s.description = %q{Search Engine Optimization (SEO) plugin for Ruby on Rails applications.} - s.email = %q{kpumuk@kpumuk.info} - s.extra_rdoc_files = [ - "README.rdoc" - ] - s.files = [ - ".gitignore", - "MIT-LICENSE", - "README.rdoc", - "Rakefile", - "VERSION.yml", - "init.rb", - "lib/meta_tags.rb", - "lib/meta_tags/controller_helper.rb", - "lib/meta_tags/view_helper.rb", - "meta-tags.gemspec", - "spec/meta_tags_spec.rb", - "spec/spec_helper.rb" - ] - s.homepage = %q{http://github.com/kpumuk/meta-tags} - s.rdoc_options = ["--charset=UTF-8"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.7} - s.summary = %q{Collection of SEO helpers for Ruby on Rails} - s.test_files = [ - "spec/meta_tags_spec.rb", - "spec/spec_helper.rb" - ] - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 + s.add_dependency 'actionpack' - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - else - end - else - end -end + s.add_development_dependency 'rspec' + s.add_development_dependency 'yard' + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {spec,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + s.extra_rdoc_files = ['README.rdoc'] + s.rdoc_options = ['--charset=UTF-8'] + s.require_paths = ['lib'] +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3e1d17d0..fa2e27e8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,2 @@ -require 'rubygems' -require 'action_controller' -require 'action_view' - -require File.join(File.dirname(__FILE__), "../init") +require 'bundler/setup' +require 'meta_tags'