innate 2013.02.21 → 2015.10.28

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 75ffcfa9fd74b61c7ac01f8f9e5c457724bf7bb6
4
+ data.tar.gz: 02369d1f42cc9c3c5aa08b3f21985b66a61aebe9
5
+ SHA512:
6
+ metadata.gz: d6a93c61231bf5160a6f0c6c25e5272d3800be2ca7223f4c37310d5ff19ec338225021602ca34b993e08c7c565cc120ec8c6f4863b52d4e7418c53c32e8cdd28
7
+ data.tar.gz: 09c4a7c2e023898577e5d3d832185927aa0dd466e232529cc562173b2cf3fe203d440f62665743d224f7f9996d879aafa0cbb4e72456eb027dd0588b119fcfef
data/AUTHORS CHANGED
@@ -1,7 +1,7 @@
1
1
  Following persons have contributed to innate.
2
2
  (Sorted by number of submitted patches, then alphabetically)
3
3
 
4
- 821 Michael Fellinger <m.fellinger@gmail.com>
4
+ 823 Michael Fellinger <m.fellinger@gmail.com>
5
5
  31 Tadahiko Uehara <kikofx@gmail.com>
6
6
  21 Yorick Peterse <yorickpeterse@gmail.com>
7
7
  9 Lee Jarvis <injekt.me@gmail.com>
@@ -18,5 +18,6 @@ Following persons have contributed to innate.
18
18
  2 YorickPeterse <yorickpeterse@gmail.com>
19
19
  1 crab <crabtw@gmail.com>
20
20
  1 Jérémy Zurcher <jeremy@asynk.ch>
21
+ 1 Patrik Rak <patrik@raxoft.cz>
21
22
  1 ravage <ravage@fragmentized.net>
22
23
  1 Sam Carr <samcarr@gmail.com>
data/CHANGELOG CHANGED
@@ -1,3 +1,13 @@
1
+ [105060c | 2015-10-28 17:15:55 UTC] Michael Fellinger <m.fellinger@gmail.com>
2
+
3
+ * update dependencies and gem setup
4
+
5
+ [cde6b36 | 2013-10-16 14:59:44 UTC] Patrik Rak <patrik@raxoft.cz>
6
+
7
+ * Use correct session class in Current.setup.
8
+
9
+ Current.setup should honor the passed in arguments even for session.
10
+
1
11
  [866c9cd | 2013-02-21 12:21:46 UTC] Michael Fellinger <m.fellinger@gmail.com>
2
12
 
3
13
  * Version 2013.02.21
data/Rakefile CHANGED
@@ -9,12 +9,12 @@ PROJECT_README = 'README.md'
9
9
  PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
10
10
 
11
11
  DEPENDENCIES = {
12
- 'rack' => {:version => '~> 1.5.2'},
12
+ 'rack' => {:version => '~> 1.6.4'},
13
13
  }
14
14
 
15
15
  DEVELOPMENT_DEPENDENCIES = {
16
16
  'bacon' => {:version => '~> 1.2.0'},
17
- 'rack-test' => {:version => '~> 0.6.2', :lib => 'rack/test'}
17
+ 'rack-test' => {:version => '~> 0.6.3', :lib => 'rack/test'}
18
18
  }
19
19
 
20
20
  GEMSPEC = Gem::Specification.new{|s|
@@ -29,8 +29,6 @@ GEMSPEC = Gem::Specification.new{|s|
29
29
  s.files = `git ls-files`.split("\n").sort
30
30
  s.has_rdoc = true
31
31
  s.require_path = 'lib'
32
- s.rubyforge_project = "innate"
33
- s.required_rubygems_version = '>= 1.3.1'
34
32
  }
35
33
 
36
34
  DEPENDENCIES.each do |name, options|
@@ -1,36 +1,36 @@
1
1
  # -*- encoding: utf-8 -*-
2
+ # stub: innate 2015.10.28 ruby lib
2
3
 
3
4
  Gem::Specification.new do |s|
4
5
  s.name = "innate"
5
- s.version = "2013.02.21"
6
+ s.version = "2015.10.28"
6
7
 
7
- s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
8
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
+ s.require_paths = ["lib"]
8
10
  s.authors = ["Michael 'manveru' Fellinger"]
9
- s.date = "2013-02-21"
11
+ s.date = "2015-10-28"
10
12
  s.description = "Simple, straight-forward base for web-frameworks."
11
13
  s.email = "m.fellinger@gmail.com"
12
14
  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"]
13
15
  s.homepage = "http://github.com/manveru/innate"
14
- s.require_paths = ["lib"]
15
- s.rubyforge_project = "innate"
16
- s.rubygems_version = "1.8.25"
16
+ s.rubygems_version = "2.4.5"
17
17
  s.summary = "Powerful web-framework wrapper for Rack."
18
18
 
19
19
  if s.respond_to? :specification_version then
20
- s.specification_version = 3
20
+ s.specification_version = 4
21
21
 
22
22
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
23
- s.add_runtime_dependency(%q<rack>, ["~> 1.5.2"])
23
+ s.add_runtime_dependency(%q<rack>, ["~> 1.6.4"])
24
24
  s.add_development_dependency(%q<bacon>, ["~> 1.2.0"])
25
- s.add_development_dependency(%q<rack-test>, ["~> 0.6.2"])
25
+ s.add_development_dependency(%q<rack-test>, ["~> 0.6.3"])
26
26
  else
27
- s.add_dependency(%q<rack>, ["~> 1.5.2"])
27
+ s.add_dependency(%q<rack>, ["~> 1.6.4"])
28
28
  s.add_dependency(%q<bacon>, ["~> 1.2.0"])
29
- s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
29
+ s.add_dependency(%q<rack-test>, ["~> 0.6.3"])
30
30
  end
31
31
  else
32
- s.add_dependency(%q<rack>, ["~> 1.5.2"])
32
+ s.add_dependency(%q<rack>, ["~> 1.6.4"])
33
33
  s.add_dependency(%q<bacon>, ["~> 1.2.0"])
34
- s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
34
+ s.add_dependency(%q<rack-test>, ["~> 0.6.3"])
35
35
  end
36
36
  end
@@ -29,7 +29,7 @@ module Innate
29
29
  req = current[:request] = request.new(env)
30
30
  res = current[:response] = response.new
31
31
  current[:actions] = []
32
- current[:session] = Session.new(req, res)
32
+ current[:session] = session.new(req, res)
33
33
  end
34
34
  end
35
35
  end
@@ -1,3 +1,3 @@
1
1
  module Innate
2
- VERSION = "2013.02.21"
2
+ VERSION = "2015.10.28"
3
3
  end
@@ -14,7 +14,7 @@ task :gem_setup do
14
14
  setup
15
15
  end
16
16
 
17
- def gem(name, version = nil, options = {})
17
+ def use_gem(name, version = nil, options = {})
18
18
  if version.respond_to?(:merge!)
19
19
  options = version
20
20
  else
@@ -26,8 +26,7 @@ task :gem_setup do
26
26
 
27
27
  # all gems defined, let's try to load/install them
28
28
  def setup
29
- require 'rubygems'
30
- require 'rubygems/dependency_installer'
29
+ require 'rubygems/commands/install_command'
31
30
 
32
31
  @gems.each do |name, options|
33
32
  setup_gem(name, options)
@@ -37,7 +36,7 @@ task :gem_setup do
37
36
  def setup_gemspec(gemspec)
38
37
  gemspec.dependencies.each do |dependency|
39
38
  dependency.version_requirements.as_list.each do |version|
40
- gem(dependency.name, version)
39
+ use_gem(dependency.name, version)
41
40
  end
42
41
  end
43
42
 
@@ -49,49 +48,41 @@ task :gem_setup do
49
48
  # If the second activation also fails, try to require as it may just as
50
49
  # well be in $LOAD_PATH.
51
50
  def setup_gem(name, options)
52
- version = [options[:version]].compact
53
- lib_name = options[:lib] || name
54
-
55
- log "activating #{name}"
56
-
57
- Gem.activate(name, *version)
58
- rescue Gem::LoadError
59
- log "activating #{name} failed, try to install"
60
-
61
- install_gem(name, version, options)
51
+ try_require_gem(name, options)
52
+ rescue Exception
53
+ try_installing_gem(name, options)
62
54
  end
63
55
 
64
- # tell rubygems to install a gem
65
- def install_gem(name, version, options)
66
- installer = Gem::DependencyInstaller.new(options)
67
-
68
- temp_argv(options[:extconf]) do
69
- log "installing #{name}"
70
- installer.install(name, *version)
71
- end
72
-
73
- Gem.activate(name, *version)
74
-
75
- log "install and final activation successful"
76
- rescue Gem::GemNotFoundException => ex
77
- log "installation failed: #{ex}, use normal require"
78
-
79
- require(options[:lib] || name)
80
-
81
- log "require successful, cannot verify version though"
56
+ def try_require_gem(name, options)
57
+ lib_name = options[:lib] || name
58
+ version = [options[:version]].compact
59
+ gem name, version[0]
60
+ require lib_name
82
61
  end
83
62
 
84
- # prepare ARGV for rubygems installer
85
- def temp_argv(extconf)
86
- if extconf ||= @options[:extconf]
87
- old_argv = ARGV.clone
88
- ARGV.replace(extconf.split(' '))
89
- end
90
-
91
- yield
63
+ def try_installing_gem(name, options)
64
+ cmd = Gem::Commands::InstallCommand.new
65
+ version = [options[:version]].compact
92
66
 
93
- ensure
94
- ARGV.replace(old_argv) if extconf
67
+ if version.any?
68
+ version.each do |v|
69
+ cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name, '--version', v])
70
+ Process.waitpid fork{
71
+ begin
72
+ cmd.execute
73
+ rescue Exception
74
+ end
75
+ }
76
+ end
77
+ else
78
+ cmd.handle_options(["--no-ri", "--no-rdoc", "--user-install", name])
79
+ Process.waitpid fork{
80
+ begin
81
+ cmd.execute
82
+ rescue Exception
83
+ end
84
+ }
85
+ end
95
86
  end
96
87
 
97
88
  private
@@ -106,7 +97,6 @@ task :gem_setup do
106
97
  end
107
98
  end
108
99
 
109
- def rubyforge; 'http://gems.rubyforge.org/' end
110
100
  def github; 'http://gems.github.com/' end
111
101
  end
112
102
  end
@@ -2,11 +2,11 @@ desc 'install dependencies from gemspec'
2
2
  task :setup => [:gem_setup] do
3
3
  GemSetup.new :verbose => false do
4
4
  DEPENDENCIES.each do |name, options|
5
- gem(name, options)
5
+ use_gem(name, options)
6
6
  end
7
7
 
8
8
  DEVELOPMENT_DEPENDENCIES.each do |name, options|
9
- gem(name, options)
9
+ use_gem(name, options)
10
10
  end
11
11
  end
12
12
  end
metadata CHANGED
@@ -1,75 +1,68 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: innate
3
3
  version: !ruby/object:Gem::Version
4
- version: 2013.02.21
5
- prerelease:
4
+ version: 2015.10.28
6
5
  platform: ruby
7
6
  authors:
8
7
  - Michael 'manveru' Fellinger
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-02-21 00:00:00.000000000 Z
11
+ date: 2015-10-28 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rack
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ~>
17
+ - - "~>"
20
18
  - !ruby/object:Gem::Version
21
- version: 1.5.2
19
+ version: 1.6.4
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ~>
24
+ - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: 1.5.2
26
+ version: 1.6.4
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: bacon
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ~>
31
+ - - "~>"
36
32
  - !ruby/object:Gem::Version
37
33
  version: 1.2.0
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ~>
38
+ - - "~>"
44
39
  - !ruby/object:Gem::Version
45
40
  version: 1.2.0
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: rack-test
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ~>
45
+ - - "~>"
52
46
  - !ruby/object:Gem::Version
53
- version: 0.6.2
47
+ version: 0.6.3
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ~>
52
+ - - "~>"
60
53
  - !ruby/object:Gem::Version
61
- version: 0.6.2
54
+ version: 0.6.3
62
55
  description: Simple, straight-forward base for web-frameworks.
63
56
  email: m.fellinger@gmail.com
64
57
  executables: []
65
58
  extensions: []
66
59
  extra_rdoc_files: []
67
60
  files:
68
- - .gems
69
- - .gitignore
70
- - .load_gemset
71
- - .rvmrc
72
- - .travis.yml
61
+ - ".gems"
62
+ - ".gitignore"
63
+ - ".load_gemset"
64
+ - ".rvmrc"
65
+ - ".travis.yml"
73
66
  - AUTHORS
74
67
  - CHANGELOG
75
68
  - COPYING
@@ -204,26 +197,25 @@ files:
204
197
  - tasks/ycov.rake
205
198
  homepage: http://github.com/manveru/innate
206
199
  licenses: []
200
+ metadata: {}
207
201
  post_install_message:
208
202
  rdoc_options: []
209
203
  require_paths:
210
204
  - lib
211
205
  required_ruby_version: !ruby/object:Gem::Requirement
212
- none: false
213
206
  requirements:
214
- - - ! '>='
207
+ - - ">="
215
208
  - !ruby/object:Gem::Version
216
209
  version: '0'
217
210
  required_rubygems_version: !ruby/object:Gem::Requirement
218
- none: false
219
211
  requirements:
220
- - - ! '>='
212
+ - - ">="
221
213
  - !ruby/object:Gem::Version
222
- version: 1.3.1
214
+ version: '0'
223
215
  requirements: []
224
- rubyforge_project: innate
225
- rubygems_version: 1.8.25
216
+ rubyforge_project:
217
+ rubygems_version: 2.4.5
226
218
  signing_key:
227
- specification_version: 3
219
+ specification_version: 4
228
220
  summary: Powerful web-framework wrapper for Rack.
229
221
  test_files: []