innate 2013.02.21 → 2015.10.28

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75ffcfa9fd74b61c7ac01f8f9e5c457724bf7bb6
+  data.tar.gz: 02369d1f42cc9c3c5aa08b3f21985b66a61aebe9
+SHA512:
+  metadata.gz: d6a93c61231bf5160a6f0c6c25e5272d3800be2ca7223f4c37310d5ff19ec338225021602ca34b993e08c7c565cc120ec8c6f4863b52d4e7418c53c32e8cdd28
+  data.tar.gz: 09c4a7c2e023898577e5d3d832185927aa0dd466e232529cc562173b2cf3fe203d440f62665743d224f7f9996d879aafa0cbb4e72456eb027dd0588b119fcfef

data/AUTHORS

@@ -1,7 +1,7 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   821 Michael Fellinger <m.fellinger@gmail.com>
+   823 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
     21 Yorick Peterse <yorickpeterse@gmail.com>
      9 Lee Jarvis <injekt.me@gmail.com>
@@ -18,5 +18,6 @@ Following persons have contributed to innate.
      2 YorickPeterse <yorickpeterse@gmail.com>
      1 crab <crabtw@gmail.com>
      1 Jérémy Zurcher <jeremy@asynk.ch>
+     1 Patrik Rak <patrik@raxoft.cz>
      1 ravage <ravage@fragmentized.net>
      1 Sam Carr <samcarr@gmail.com>

data/CHANGELOG

@@ -1,3 +1,13 @@
+[105060c | 2015-10-28 17:15:55 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * update dependencies and gem setup
+
+[cde6b36 | 2013-10-16 14:59:44 UTC] Patrik Rak <patrik@raxoft.cz>
+
+  * Use correct session class in Current.setup.
+
+    Current.setup should honor the passed in arguments even for session.
+
 [866c9cd | 2013-02-21 12:21:46 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2013.02.21

data/Rakefile

@@ -9,12 +9,12 @@ PROJECT_README = 'README.md'
 PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 DEPENDENCIES = {
-  'rack' => {:version => '~> 1.5.2'},
+  'rack' => {:version => '~> 1.6.4'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {
   'bacon'     => {:version => '~> 1.2.0'},
-  'rack-test' => {:version => '~> 0.6.2', :lib => 'rack/test'}
+  'rack-test' => {:version => '~> 0.6.3', :lib => 'rack/test'}
 }
 
 GEMSPEC = Gem::Specification.new{|s|
@@ -29,8 +29,6 @@ GEMSPEC = Gem::Specification.new{|s|
   s.files        = `git ls-files`.split("\n").sort
   s.has_rdoc     = true
   s.require_path = 'lib'
-  s.rubyforge_project = "innate"
-  s.required_rubygems_version = '>= 1.3.1'
 }
 
 DEPENDENCIES.each do |name, options|

data/innate.gemspec

@@ -1,36 +1,36 @@
 # -*- encoding: utf-8 -*-
+# stub: innate 2015.10.28 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "innate"
-  s.version = "2013.02.21"
+  s.version = "2015.10.28"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = "2013-02-21"
+  s.date = "2015-10-28"
   s.description = "Simple, straight-forward base for web-frameworks."
   s.email = "m.fellinger@gmail.com"
   s.files = [".gems", ".gitignore", ".load_gemset", ".rvmrc", ".travis.yml", "AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/default_middleware.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/lru_hash.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/etanni.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/response.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = "http://github.com/manveru/innate"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "innate"
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.4.5"
   s.summary = "Powerful web-framework wrapper for Rack."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.6.4"])
       s.add_development_dependency(%q<bacon>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<rack-test>, ["~> 0.6.2"])
+      s.add_development_dependency(%q<rack-test>, ["~> 0.6.3"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.5.2"])
+      s.add_dependency(%q<rack>, ["~> 1.6.4"])
       s.add_dependency(%q<bacon>, ["~> 1.2.0"])
-      s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
+      s.add_dependency(%q<rack-test>, ["~> 0.6.3"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.5.2"])
+    s.add_dependency(%q<rack>, ["~> 1.6.4"])
     s.add_dependency(%q<bacon>, ["~> 1.2.0"])
-    s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
+    s.add_dependency(%q<rack-test>, ["~> 0.6.3"])
   end
 end

data/lib/innate/current.rb

@@ -29,7 +29,7 @@ module Innate
       req = current[:request] = request.new(env)
       res = current[:response] = response.new
       current[:actions] = []
-      current[:session] = Session.new(req, res)
+      current[:session] = session.new(req, res)
     end
   end
 end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2013.02.21"
+  VERSION = "2015.10.28"
 end

data/tasks/gem_setup.rake

@@ -14,7 +14,7 @@ task :gem_setup do
       setup
     end
 
-    def gem(name, version = nil, options = {})
+    def use_gem(name, version = nil, options = {})
       if version.respond_to?(:merge!)
         options = version
       else
@@ -26,8 +26,7 @@ task :gem_setup do
 
     # all gems defined, let's try to load/install them
     def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
+      require 'rubygems/commands/install_command'
 
       @gems.each do |name, options|
         setup_gem(name, options)
@@ -37,7 +36,7 @@ task :gem_setup do
     def setup_gemspec(gemspec)
       gemspec.dependencies.each do |dependency|
         dependency.version_requirements.as_list.each do |version|
-          gem(dependency.name, version)
+          use_gem(dependency.name, version)
         end
       end
 
@@ -49,49 +48,41 @@ task :gem_setup do
     # If the second activation also fails, try to require as it may just as
     # well be in $LOAD_PATH.
     def setup_gem(name, options)
-      version = [options[:version]].compact
-      lib_name = options[:lib] || name
-
-      log "activating #{name}"
-
-      Gem.activate(name, *version)
-    rescue Gem::LoadError
-      log "activating #{name} failed, try to install"
-
-      install_gem(name, version, options)
+      try_require_gem(name, options)
+    rescue Exception
+      try_installing_gem(name, options)
     end
 
-    # tell rubygems to install a gem
-    def install_gem(name, version, options)
-      installer = Gem::DependencyInstaller.new(options)
-
-      temp_argv(options[:extconf]) do
-        log "installing #{name}"
-        installer.install(name, *version)
-      end
-
-      Gem.activate(name, *version)
-
-      log "install and final activation successful"
-    rescue Gem::GemNotFoundException => ex
-      log "installation failed: #{ex}, use normal require"
-
-      require(options[:lib] || name)
-
-      log "require successful, cannot verify version though"
+    def try_require_gem(name, options)
+      lib_name = options[:lib] || name
+      version = [options[:version]].compact
+      gem name, version[0]
+      require lib_name
     end
 
-    # prepare ARGV for rubygems installer
-    def temp_argv(extconf)
-      if extconf ||= @options[:extconf]
-        old_argv = ARGV.clone
-        ARGV.replace(extconf.split(' '))
-      end
-
-      yield
+    def try_installing_gem(name, options)
+      cmd = Gem::Commands::InstallCommand.new
+      version = [options[:version]].compact
 
-    ensure
-      ARGV.replace(old_argv) if extconf
+      if version.any?
+        version.each do |v|
+          cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name, '--version', v])
+          Process.waitpid fork{
+            begin
+              cmd.execute
+            rescue Exception
+            end
+          }
+        end
+      else
+        cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name])
+        Process.waitpid fork{
+          begin
+            cmd.execute
+          rescue Exception
+          end
+        }
+      end
     end
 
     private
@@ -106,7 +97,6 @@ task :gem_setup do
       end
     end
 
-    def rubyforge; 'http://gems.rubyforge.org/' end
     def github; 'http://gems.github.com/' end
   end
 end

data/tasks/setup.rake

@@ -2,11 +2,11 @@ desc 'install dependencies from gemspec'
 task :setup => [:gem_setup] do
   GemSetup.new :verbose => false do
     DEPENDENCIES.each do |name, options|
-      gem(name, options)
+      use_gem(name, options)
     end
 
     DEVELOPMENT_DEPENDENCIES.each do |name, options|
-      gem(name, options)
+      use_gem(name, options)
     end
   end
 end

metadata

@@ -1,75 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: innate
 version: !ruby/object:Gem::Version
-  version: 2013.02.21
-  prerelease: 
+  version: 2015.10.28
 platform: ruby
 authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.3
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
-- .gitignore
-- .load_gemset
-- .rvmrc
-- .travis.yml
+- ".gems"
+- ".gitignore"
+- ".load_gemset"
+- ".rvmrc"
+- ".travis.yml"
 - AUTHORS
 - CHANGELOG
 - COPYING
@@ -204,26 +197,25 @@ files:
 - tasks/ycov.rake
 homepage: http://github.com/manveru/innate
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: innate
-rubygems_version: 1.8.25
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Powerful web-framework wrapper for Rack.
 test_files: []