scooter 4.4.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ee42b55cc8598a9db2fc4387c2264a4640bebfb6f7ea8ca355683322e8aa11
-  data.tar.gz: c291fb00160b93af27adc57c9c71a656e472b4b994d1595b131c0a68d00e82cc
+  metadata.gz: 8a51dc85b391f30b7a1c290991657d5b2cc10dcbcf92b6b6e28038c99a21cf0e
+  data.tar.gz: 64fe7a8d960030cb110b419273474fd6b2d0a9bf8f624833c4405fd2bce794b4
 SHA512:
-  metadata.gz: d2316f3f3c016ee9000eb1d711d6a701fa8da1bc0a8bd7a0762bff46ddbc0eeff008ef27c4296e99a4c7afc047eb7d194cd0e58cb5bea1d061d884f2e833c5ad
-  data.tar.gz: 9ac6cd659cc7307f19789e4613fe09ee8f549c85c0af6202d076e7c34f5f081cc3efc84a1fcb30bc29abacc9605ce4770743e6a44c91f86716c808a2c82e54b1
+  metadata.gz: 55d3e3ed3c94a71ee5a6a7fe31d483ca817f08f0e6565663f14eb207eeaa899a14d3c1074e7277d56f280447bb9036e67c55a79a1ab35f40562c1e3fc4ff84a9
+  data.tar.gz: 350645031af0896590dfab91a5eb426b0feb50b244cc7895c2a055ea69d0a747e244794a0c8c5d4c247cc12ab1202e718bf102e39c17b93be0b483ef006e9272

data/.github/workflows/unit-tests.yaml

@@ -1,21 +1,28 @@
 name: Unit
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    type: [opened, reopened, edited]
+    branches: [main]
 
 jobs:
   unit:
     name: Unit
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: "2.7"
+          - ruby: "3.1"
+          - ruby: "3.2"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.x'
+          ruby-version: ${{ matrix.ruby }}
       - name: Install bundler
         run: |
           gem install bundler

data/README.md

@@ -32,7 +32,7 @@ Scooter is currently divvied into the following sections:
 ## Running the tests
 
 ```
-bundle exec rake spec
+bundle exec rake test
 ```
 
 ## Versioning

data/lib/scooter/httpdispatchers/consoledispatcher.rb

@@ -88,8 +88,13 @@ module Scooter
       end
 
       def signin(login=self.credentials.login, password=self.credentials.password)
+        response = @connection.get "/auth/login"
+        return response if response.status != 200
+        # extract the session cookie, if it is present
+        cookie = response.headers['Set-Cookie']
         response = @connection.post "/auth/login" do |request|
           request.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
+          request.headers['Cookie'] = cookie if cookie
           request.body = "username=#{login}&password=#{CGI.escape(password)}"
           connection.port = 443
         end

data/lib/scooter/httpdispatchers/rbac.rb

@@ -27,7 +27,7 @@ module Scooter
         display_name = options['display_name'] || RandomString.generate(8)
         login        = options['login'] || RandomString.generate(16)
         role_ids     = options['role_ids'] || []
-        password     = options['password'] || 'Puppet11'
+        password     = options['password'] || 'Puppetlabs-1'
 
         user_hash = { 'email'        => email,
                       'display_name' => display_name,

data/lib/scooter/version.rb

@@ -1,5 +1,5 @@
 module Scooter
   module Version
-    STRING = '4.4.0'
+    STRING = '4.5.1'
   end
 end

data/scooter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
-  spec.add_development_dependency 'beaker-abs', '~>0.10.0'
+  spec.add_development_dependency 'beaker-abs'
   spec.add_development_dependency 'webmock', '~> 3.13'
 
   #Documentation dependencies
@@ -31,11 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'activesupport', '4.2.8'
 
   #Run time dependencies
-  spec.add_runtime_dependency 'beaker', '~> 4.0'
-  spec.add_runtime_dependency 'json', '>= 2.3.0'
+  spec.add_runtime_dependency 'beaker'
+  spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'test-unit'
-  spec.add_runtime_dependency 'net-ldap', '~> 0.16.0'
-  spec.add_runtime_dependency 'faraday', '~> 1.5'
+  spec.add_runtime_dependency 'net-ldap', '~> 0.16'
+  spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware', '~> 1.2'
-  spec.add_runtime_dependency 'faraday-cookie_jar', '~> 0.0', '>= 0.0.7'
+  spec.add_runtime_dependency 'faraday-cookie_jar', '>= 0.0.7'
 end

data/spec/scooter/httpdispatchers/consoledispatcher_spec.rb

@@ -28,6 +28,12 @@ module Scooter
 
       context '"signin with a page that returns a token' do
         before do
+          stub_request(:get, /auth\/login/).
+            to_return(status: 200,
+                      body: '',
+                      headers: {
+                        "set-cookie"=>"__HOST-somecookie=something;Secure;Path=/",
+                      })
           stub_request(:post, /auth\/login/).
             to_return(status: 200,
                       body: '',
@@ -35,7 +41,7 @@ module Scooter
                                 "date"=>"Tue, 29 Nov 2016 22:05:41 GMT",
                                 "content-length"=>"0",
                                 "connection"=>"close",
-                                "set-cookie"=>"JSESSIONID=b05e9b11-5e9f-4d6a-9faf-e28a0415197d; Path=/; Secure; HttpOnly, rememberMe=deleteMe; Path=/auth; Max-Age=0; Expires=Mon, 28-Nov-2016 22:05:41 GMT, pl_ssti=0CeHhpz5PPLna7kpaEMcTHjJ62z9eizHTzsxEXNK8W20;Secure;Path=/",
+                                "set-cookie"=>"__HOST-pl_ssti=0CeHhpz5PPLna7kpaEMcTHjJ62z9eizHTzsxEXNK8W20;Secure;Path=/",
                                 "location"=>"/",
                                 "x-frame-options"=>"DENY"})
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scooter
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: beaker-abs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -140,30 +140,30 @@ dependencies:
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -224,9 +224,6 @@ dependencies:
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
@@ -234,9 +231,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
@@ -317,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: Puppetlabs testing tool