seatsio 42.3.0 → 43.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50abbe13ab73a03409fd6396266a9a413fa78f4a2c9dfc4c10059a0bfdca3d4
-  data.tar.gz: e63dd59695934f136cdfbc0d178be183cfbf9a6f2526e886ad7e9bea4fb5741d
+  metadata.gz: 3d7be68487b9ae3ceafe4802ba51c25c0623cfcb0d99cc6888806556a705b501
+  data.tar.gz: 5d778458ff35a5dd85814b03c375d9d94c0ebf9f75cac084707df1cd6eaa38b7
 SHA512:
-  metadata.gz: 10794c6985afcaa64ad17fa801d1e6f64268150a18e9b3f3b99229eec5899c09367e8f395b2bd7aab5dd74172b3819c9403ef12ea78a1146dfc125f2a9e0a5e5
-  data.tar.gz: a18ce18789b0d61636b04bda1accb1752de99ca56c8d1d00ad917710e3bdab103d9454e913e51d23021af67afc8da2eef31b3b241a227303ebbcb68dbc4ff84b
+  metadata.gz: 58f5d940d4e0af4fc6671b9f5c4f98db7062706c7f41ae7091d67e4a2ad40653206c66ea14ffdc6ea5716bdd4d4ee61c2f0119fcc365a1b817d457c406433528
+  data.tar.gz: 9642021c0a88a10ec084e08c042531fc3e0e3ea17129eb4328ae40d371a8c99e6fa49b1792a9cfe3c52f8e4f7af34f0d923b2f3c9d7ed53f917c9a5be7504457

data/.github/workflows/release.yml

@@ -0,0 +1,44 @@
+# Very important!
+# Make sure that the github token has read AND WRITE access on github.
+#   1. hit https://github.com/seatsio/[REPO]/settings/actions
+#   2. under "Workflow permissions", make sure "Read and write permissions" is checked instead of the (default?) read only.
+#
+
+name: Release
+run-name: Release ${{ github.repository }}
+on:
+  workflow_dispatch:
+    inputs:
+      versionToBump:
+        description: 'The version to bump. Major for incompatible API changes, minor for adding BC features'
+        required: true
+        type: choice
+        options:
+          - minor
+          - major
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: fregante/setup-git-user@v2
+      - id: install-zx
+        run: npm i -g zx
+      - id: install-semver-tool
+        run: |
+          wget -O /usr/local/bin/semver https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver
+          chmod +x /usr/local/bin/semver
+      - run: zx ./release.mjs -v $VERSION_TO_BUMP
+        env:
+          VERSION_TO_BUMP: ${{ inputs.versionToBump }}
+          GH_TOKEN: ${{ github.token }}
+      - run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
+

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    seatsio (42.3.0)
+    seatsio (43.2.0)
+      rest-client (~> 2.0, >= 2.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +20,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
-    minitest (5.17.0)
+    minitest (5.18.0)
     minitest-parallel_fork (1.3.0)
       minitest (>= 5.15.0)
     netrc (0.11.0)
@@ -47,7 +48,6 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-parallel_fork (~> 1.3)
   rake (~> 13.0)
-  rest-client (~> 2.0, >= 2.0.2)
   seatsio!
   webmock (~> 3.4, >= 3.4.2)
 

data/lib/seatsio/domain.rb

@@ -425,7 +425,7 @@ module Seatsio
     end
   end
 
-  class UsageSummaryForAllMoths
+  class UsageSummaryForAllMonths
     attr_reader :items
 
     def initialize(data)
@@ -441,9 +441,6 @@ module Seatsio
     def initialize(data)
       @month = Month.from_json(data['month'])
       @num_used_objects = data['numUsedObjects']
-      @num_first_bookings = data['numFirstBookings']
-      @num_first_bookings_by_status = data['numFirstBookingsByStatus']
-      @num_first_bookings_or_selections = data['numFirstBookingsOrSelections']
     end
   end
 
@@ -484,8 +481,6 @@ module Seatsio
     def initialize(data)
       @event = UsageEvent.new(data['event'])
       @num_used_objects = data['numUsedObjects']
-      @num_first_bookings = data['numFirstBookings']
-      @num_object_selections = data['numObjectSelections']
     end
   end
 
@@ -499,7 +494,7 @@ module Seatsio
     end
   end
 
-  class UsageForObject
+  class UsageForObjectV1
 
     attr_reader :object, :num_first_bookings, :first_booking_date, :num_first_bookings, :num_first_bookings_or_selections
 
@@ -512,6 +507,17 @@ module Seatsio
     end
   end
 
+  class UsageForObjectV2
+
+    attr_reader :object, :num_used_objects, :usage_by_reason
+
+    def initialize(data)
+      @object = data['object']
+      @num_used_objects = data['numUsedObjects']
+      @usage_by_reason = data['usageByReason']
+    end
+  end
+
   class Month
 
     attr_reader :year, :month

data/lib/seatsio/usage_reports.rb

@@ -13,7 +13,7 @@ module Seatsio
     def summary_for_all_months
       url = "reports/usage"
       body = @http_client.get(url)
-      UsageSummaryForAllMoths.new(body)
+      UsageSummaryForAllMonths.new(body)
     end
 
     def details_for_month(month)
@@ -25,7 +25,11 @@ module Seatsio
     def details_for_event_in_month(eventId, month)
       url = "reports/usage/month/" + month.serialize + "/event/" + eventId.to_s
       body = @http_client.get(url)
-      body.map { |item| UsageForObject.new(item) }
+      if body.empty? or !body[0].key?('usageByReason')
+        body.map { |item| UsageForObjectV1.new(item) }
+      else
+        body.map { |item| UsageForObjectV2.new(item) }
+      end
     end
   end
 end

data/lib/seatsio/version.rb

@@ -1,3 +1,3 @@
 module Seatsio
-  VERSION = "42.3.0"
+  VERSION = "43.2.0"
 end

data/release.mjs

@@ -0,0 +1,93 @@
+#!/usr/bin/env zx
+
+/*
+* Script to release the seats.io java lib.
+*   - changes the version number in README.md
+*   - changes the version number in build.gradle
+*   - creates the release in Gihub (using gh cli)
+*
+*
+* Prerequisites:
+*   - zx installed (https://github.com/google/zx)
+*   - gh cli installed (https://cli.github.com/)
+*   - semver cli installed (https://github.com/fsaintjacques/semver-tool)
+*
+* Usage:
+*   zx ./release.mjs -v major/minor -n "release notes"
+* */
+
+// don't output the commands themselves
+$.verbose = false
+
+const versionToBump = getVersionToBump()
+const latestVersion = await fetchLatestReleasedVersionNumber()
+const nextVersion = await determineNextVersionNumber(latestVersion)
+
+await pullLastVersion()
+    .then(bumpVersionInFiles)
+    .then(commitAndPush)
+    .then(release)
+
+function getVersionToBump() {
+    if (!argv.v || !(argv.v === 'minor' || argv.v === 'major')) {
+        throw new Error ("Please specify -v major/minor")
+    }
+    return argv.v
+}
+
+function removeLeadingV(tagName) {
+    if (tagName.startsWith('v')) {
+        return tagName.substring(1)
+    }
+    return tagName
+}
+
+async function fetchLatestReleasedVersionNumber() {
+    let result = await $`gh release view --json tagName`
+    let tagName = JSON.parse(result).tagName
+    return removeLeadingV(tagName)
+}
+
+async function determineNextVersionNumber(previous) {
+    return (await $`semver bump ${versionToBump} ${previous}`).stdout.trim()
+}
+
+async function bumpVersionInFiles() {
+    await replaceInFile("./lib/seatsio/version.rb", `VERSION = "${latestVersion}"`, `VERSION = "${nextVersion}"`)
+    await replaceInFile("Gemfile.lock", `seatsio (${latestVersion})`, `seatsio (${nextVersion})`)
+}
+
+async function replaceInFile(filename, latestVersion, nextVersion) {
+    return await fs.readFile(filename, 'utf8')
+        .then(text => {
+            if (text.indexOf(latestVersion) < 0) {
+                throw new Error('Not the correct version. Could not find ' + latestVersion + ' in ' + filename)
+            }
+            return text
+        })
+        .then(text => text.replace(latestVersion, nextVersion))
+        .then(text => fs.writeFileSync(filename, text))
+        .then(() => gitAdd(filename))
+}
+
+async function pullLastVersion() {
+    await $`git checkout master`
+    await $`git pull origin master`
+}
+
+async function gitAdd(filename) {
+    return await $`git add ${filename}`
+}
+
+async function commitAndPush() {
+    await $`git commit -m "version bump"`
+    await $`git push origin master`
+}
+
+async function release() {
+    const newTag = 'v' + nextVersion
+    return await $`gh release create ${newTag} --generate-notes`.catch(error => {
+        console.error('something went wrong while creating the release. Please revert the version change!')
+        throw error
+    })
+}

data/seatsio.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "rest-client", '~> 2.0', '>= 2.0.2'
+
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rest-client", '~> 2.0', '>= 2.0.2'
   spec.add_development_dependency 'webmock', '~> 3.4', '>= 3.4.2'
   spec.add_development_dependency 'minitest-parallel_fork', '~> 1.3'
 end

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: seatsio
 version: !ruby/object:Gem::Version
-  version: 42.3.0
+  version: 43.2.0
 platform: ruby
 authors:
 - Seats.io
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ files:
 - ".editorconfig"
 - ".github/dependabot.yml"
 - ".github/workflows/build.yml"
-- ".github/workflows/publish.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
@@ -145,7 +145,7 @@ files:
 - lib/seatsio/util.rb
 - lib/seatsio/version.rb
 - lib/seatsio/workspaces.rb
-- releasing.md
+- release.mjs
 - seatsio.gemspec
 homepage: http://seats.io
 licenses: []

data/.github/workflows/publish.yml

@@ -1,21 +0,0 @@
-name: 'Publish'
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"

data/releasing.md

@@ -1,5 +0,0 @@
-*Note: this is internal documentation for the seats.io team*
-
-1) Set the correct version number in lib/seatsio/version.rb
-1) Set the correct version number in Gemfile.lock
-2) Create the release in GitHub