padrino-gen 0.15.2 → 0.16.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4715ef3a71b10c1c828571ecc035af5e589b4f657376fc6c7ee17a5dbd21bcf5
-  data.tar.gz: 6a38e83c98b6db24b9415194fac781daeb477ffac5cafd8bf5bd5283a22898bb
+  metadata.gz: 2f034aa058ccb73307b88de840bb55e1e61d004c43d840676374ae1129041ea0
+  data.tar.gz: dc4bb733df1936970c29bb58771a1af22f8d48a5f3f49e5521ebd7e402d7d63f
 SHA512:
-  metadata.gz: ed706f3cd3d2e29c84155019bffb0967ddb35641cb2e2afb84e05bed4dbbd603fc672342f54714d76723de706de1ab4b991f7f39d2384799625e2fba6dd8e5e1
-  data.tar.gz: 41cb109b4e0afeb29150e406416de84bd28a1c403d808ebb4729fb5c4e19f8d15612a549a2fcf87ffaeb5d64006eafaffe504bea39265f7badd44dd6fe543218
+  metadata.gz: 6810bd4a81c3829dbd581223f8555247d7b591255dae000b7aa84a367522469bd1c80a1de314feef9f2c21dc4eeae6a79cf264a0a0b8fd3a2478fdd546dcbb7c
+  data.tar.gz: d0a114751d530162c4fefaeed2c62eb0a36f0ec46985f9933357daf5b18c5e444b683568a4c39fa3a542bb2c90cb3877546bbe019fd03e4960ec758eba80e390

data/lib/padrino-gen/generators/components/tests/minitest.rb

@@ -3,7 +3,7 @@ RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
-class MiniTest::Spec
+class Minitest::Spec
   include Rack::Test::Methods
 
   # You can use this method to custom specify a Rack app

data/lib/padrino-gen/generators/templates/project_bin.tt

@@ -9,6 +9,6 @@ require 'padrino-core/cli/launcher'
 ARGV.unshift('start') if ARGV.first.nil? || ARGV.first.start_with?('-')
 Padrino::Cli::Launcher.start ARGV
 
-# Start the app with Rack::Server
-#require "rack"
-#Rack::Server.start
+# Start the app with Rackup::Server
+#require "rackup"
+#Rackup::Server.start

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -136,7 +136,11 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         ActiveRecord::MigrationContext.new("db/migrate/", ActiveRecord::SchemaMigration).migrate(env_migration_version)
       end
 
-      Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      if less_than_active_record_7_0?
+        Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      else
+        Rake::Task["ar:schema:dump"].invoke if ActiveRecord.schema_format == :ruby
+      end
     end
 
     namespace :migrate do
@@ -424,6 +428,10 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     ActiveRecord.version < Gem::Version.create("6.1.0")
   end
 
+  def less_than_active_record_7_0?
+    ActiveRecord.version < Gem::Version.create("7.0.0")
+  end
+
   def with_database(env_name)
     if less_than_active_record_6_0?
       config = ActiveRecord::Base.configurations.with_indifferent_access[env_name]
@@ -452,7 +460,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
   def configuration_hash(configuration)
     return configuration if less_than_active_record_6_0?
-    config = less_than_active_record_6_1 ? configuration.config : configuration.configuration_hash
+    config = less_than_active_record_6_1? ? configuration.config : configuration.configuration_hash
     config.with_indifferent_access
   end
 

data/test/helper.rb

@@ -1,7 +1,6 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'rack/test'
-require 'fakeweb'
 require 'thor/group'
 require 'padrino-gen'
 require 'padrino-core'
@@ -9,29 +8,38 @@ require 'padrino-mailer'
 require 'padrino-helpers'
 
 require 'ext/minitest-spec'
-require 'ext/fakeweb-ruby24'
 require 'mocha/minitest'
+require 'webmock/minitest'
 
 Padrino::Generators.load_components!
 
-# register fake URL to avoid downloading static files every time tests run
-fake_uri_base = "https://raw.github.com/padrino/padrino-static/master/"
-%W[
-  js/dojo.js ujs/dojo.js
-  js/ext.js ujs/ext.js
-  js/jquery.js ujs/jquery.js
-  js/mootools.js ujs/mootools.js
-  js/right.js ujs/right.js
-  js/protopak.js js/lowpro.js ujs/prototype.js
-].each do |suffix|
-  FakeWeb.register_uri(:get, fake_uri_base + suffix, :body => '')
-end
-
-class MiniTest::Spec
+class Minitest::Spec
   def stop_time_for_test
     time = Time.now
     Time.stubs(:now).returns(time)
-    return time
+    time
+  end
+
+  def stub_static_files
+    # register fake URL to avoid downloading static files every time tests run
+    fake_uri_base = "https://raw.github.com/padrino/padrino-static/master/"
+    %w[
+      js/dojo.js
+      js/ext.js
+      js/jquery.js
+      js/lowpro.js
+      js/mootools.js
+      js/protopak.js
+      js/right.js
+      ujs/dojo.js
+      ujs/ext.js
+      ujs/jquery.js
+      ujs/mootools.js
+      ujs/prototype.js
+      ujs/right.js
+    ].each do |suffix|
+      WebMock::API.stub_request(:get, fake_uri_base + suffix)
+    end
   end
 
   # generate(:controller, 'DemoItems', '-r=/tmp/sample_project')
@@ -44,7 +52,7 @@ class MiniTest::Spec
   def generate_with_parts(name, *params)
     features, constants = [$", Object.constants].map{|x| Marshal.load(Marshal.dump(x)) }
 
-    if root = params.find{|x| x.index(/\-r=|\-\-root=/) }
+    if root = params.find{|x| x.index(/-r=|--root=/) }
       root = root.split(/=/)[1]
       options, model_path = {}, File.expand_path(File.join(root, "/models/**/*.rb"))
       options = params.pop if params.last.is_a?(Hash)
@@ -69,7 +77,7 @@ class MiniTest::Spec
     options = options.dup
     project_root = options.delete(:root)
     project_name = options.delete(:name)
-    components = options.sort_by{ |k, v| k.to_s }.map{ |component, value| "--#{component}=#{value}" }
+    components = options.sort_by{ |k, _v| k.to_s }.map{ |component, value| "--#{component}=#{value}" }
     params = [project_name, *components].push("-r=#{project_root}")
     Padrino.expects(:bin_gen).with(*params.unshift('project')).returns(true)
   end

data/test/test_component_generator.rb

@@ -5,6 +5,7 @@ describe "ComponentGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
+    stub_static_files
   end
 
   def teardown

data/test/test_plugin_generator.rb

@@ -12,22 +12,22 @@ describe "PluginGenerator" do
 
   describe "the plugin generator" do
     it 'should respect --root option' do
-      path = File.expand_path('../fixtures/plugin_template.rb', __FILE__)
+      path = File.expand_path('fixtures/plugin_template.rb', __dir__)
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
-      out, err = capture_io { generate(:plugin, path, "--root=#{@apptmp}/sample_project") }
-      refute_match /You are not at the root/, out
+      out, _err = capture_io { generate(:plugin, path, "--root=#{@apptmp}/sample_project") }
+      refute_match(/You are not at the root/, out)
     end
   end
 
   describe "the plugin destroy option" do
     it 'should remove the plugin instance' do
-      path = File.expand_path('../fixtures/plugin_template.rb', __FILE__)
+      path = File.expand_path('fixtures/plugin_template.rb', __dir__)
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:plugin, path, "--root=#{@apptmp}/sample_project") }
       capture_io { generate(:plugin, path, "--root=#{@apptmp}/sample_project", '-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/lib/hoptoad_initializer.rb")
-      assert_no_match_in_file(/enable \:raise_errors/,"#{@apptmp}/sample_project/app/app.rb")
-      assert_no_match_in_file(/rack\_hoptoad/, "#{@apptmp}/sample_project/Gemfile")
+      assert_no_match_in_file(/enable :raise_errors/,"#{@apptmp}/sample_project/app/app.rb")
+      assert_no_match_in_file(/rack_hoptoad/, "#{@apptmp}/sample_project/Gemfile")
     end
   end
 
@@ -54,14 +54,14 @@ describe "PluginGenerator" do
 
     it 'should resolve generic url properly' do
       template_file = 'http://www.example.com/test.rb'
-      FakeWeb.register_uri :get, template_file, :body => ''
+      stub_request :get, template_file
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(template_file).returns(true).once
       capture_io { project_gen.invoke_all }
     end
 
     it 'should resolve gist url properly' do
-      FakeWeb.register_uri(:get, "https://gist.github.com/357045", :body => '<a href="/raw/357045/4356/blog_template.rb">raw</a>')
+      stub_request(:get, "https://gist.github.com/357045").to_return(body: '<a href="/raw/357045/4356/blog_template.rb">raw</a>')
       template_file = 'https://gist.github.com/357045'
       resolved_path = 'https://gist.github.com/raw/357045/4356/blog_template.rb'
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
@@ -72,7 +72,7 @@ describe "PluginGenerator" do
     it 'should resolve official template' do
       template_file = 'sampleblog'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/templates/sampleblog_template.rb"
-      FakeWeb.register_uri :get, resolved_path, :body => template_file
+      stub_request(:get, resolved_path).to_return(body: template_file)
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(resolved_path).returns(true).once
       capture_io { project_gen.invoke_all }
@@ -88,7 +88,7 @@ describe "PluginGenerator" do
     it 'should resolve official plugin' do
       template_file = 'hoptoad'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hoptoad_plugin.rb"
-      FakeWeb.register_uri :get, resolved_path, :body => template_file
+      stub_request(:get, resolved_path).to_return(body: template_file)
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       plugin_gen.expects(:apply).with(resolved_path).returns(true).once
@@ -98,7 +98,7 @@ describe "PluginGenerator" do
     it 'should print a warning if template cannot be found' do
       template_file  = 'hwat'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hwat_plugin.rb"
-      FakeWeb.register_uri :get, resolved_path, :status => 404
+      stub_request(:get, resolved_path).to_return(status: 404)
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       # Use regex to ignore trailing whitespace in message
@@ -124,7 +124,7 @@ describe "PluginGenerator" do
   describe "with git commands" do
     it 'should generate a repository correctly' do
       skip 'Change stubs here'
-      expects_generated_project :test => :rspec, :orm => :activerecord, :name => 'sample_git', :root => "#{@apptmp}"
+      expects_generated_project :test => :rspec, :orm => :activerecord, :name => 'sample_git', :root => @apptmp.to_s
       expects_git :init, :root => "#{@apptmp}/sample_git"
       expects_git :add, :arguments => '.', :root => "#{@apptmp}/sample_git"
       expects_git :commit, :arguments => 'hello', :root => "#{@apptmp}/sample_git"
@@ -135,7 +135,7 @@ describe "PluginGenerator" do
 
   describe "with rake invocations" do
     it 'should Run rake task and list tasks' do
-      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_rake', :root => "#{@apptmp}"
+      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_rake', :root => @apptmp.to_s
       expects_rake "custom", :root => "#{@apptmp}/sample_rake"
       rake_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'rake_template.rb')
       capture_io { generate(:project, 'sample_rake', "-p=#{rake_template_path}", "-r=#{@apptmp}", '> /dev/null') }
@@ -144,7 +144,7 @@ describe "PluginGenerator" do
 
   describe "with admin commands" do
     it 'should generate correctly an admin' do
-      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_admin', :root => "#{@apptmp}"
+      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_admin', :root => @apptmp.to_s
       expects_generated :model, "post title:string body:text -r=#{@apptmp}/sample_admin"
       expects_rake "ar:create", :root => "#{@apptmp}/sample_admin"
       expects_generated :admin, "-r=#{@apptmp}/sample_admin"

data/test/test_project_generator.rb

@@ -4,6 +4,7 @@ describe "ProjectGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
+    stub_static_files
   end
 
   def teardown
@@ -561,7 +562,7 @@ describe "ProjectGenerator" do
       assert_match_in_file(/gem 'minitest'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/include Rack::Test::Methods/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
-      assert_match_in_file(/MiniTest::Spec/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/Minitest::Spec/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/SampleProject::App\.tap/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/Rake::TestTask\.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0.pre2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,28 +53,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0.pre2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -219,11 +219,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Generators for easily creating and building padrino applications