ffi-gdal 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c036d0cf23730afb86eeae6fddf3be5c319574e0de33d9ca0cb3a9bf71aeda
-  data.tar.gz: 16f1252a580de33a2b4779993f7a962db2182d49a56adaec5fd4a6e7e1e519bf
+  metadata.gz: 9a08650a0f17b4ad91a856ae99c4b9d978e09be3fe25aa5b9d88da977c62851b
+  data.tar.gz: 25aa3cd3bd5d82aaced46cfa83261890573a3cfee599208b08a362232bc43799
 SHA512:
-  metadata.gz: 67e94c7de204e4a3b2b5c11b3fc9eeabcfae1f52e4fa6786f1ad7594fb69c76ba43adbf8c9ae7defd0578dee6113761cec225f37240aa7b5926b2f84bde53438
-  data.tar.gz: 4d16c5f9b75e968bd2177be1bc9eb123ea4dc054b38e5367df8e89efd35e5daac66bfabbdd272488d55ebf23db234981ec6b455b85218276577b9ff271f4a5d5
+  metadata.gz: ce380111d93fbddf4c689cda132050ae8b43925e0caddc6ff90f4e0d29e252e599108d8625acffc25e68b361b6bcfe0890a12a99111be86bf736b85f207a1bca
+  data.tar.gz: c9e381bf12b270b16b2a2eb0aeb5fd29e8b8f1a1d9be4fd62f1cdc4f00903520fcc85782983022f651c707e7d4e113f8e6f1b749c275867b78090eb881fa3648

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/codacy.yml

@@ -40,7 +40,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
+        uses: codacy/codacy-analysis-cli-action@d43127fe38d20c527dc1951ae5aea23148bab738
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

data/.github/workflows/dependency-review.yml

@@ -17,4 +17,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v3
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v2
+        uses: actions/dependency-review-action@v3

data/.github/workflows/specs-in-docker.yml

@@ -13,12 +13,14 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@master
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
       - name: Build gdal2 image
         run: |
           docker compose version

data/Changelog.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2023-01-13
+
+### Fixed
+
+- Fix requires for lib/*/extensions/all.rb.
+
+## [1.0.1] - 2023-01-13
+
+### Fixed
+
+- Fix NoMethodError in `OGR::GeometryMixins::Extensions#utm_zone` when geometry is invalid.
+
 ## [1.0.0] — 2023-01-06
 
 Changes for all releases leading up to 1.0.0 can be found in [Changelog-0.x](/Changelog-0.x.md).

data/Dockerfile.gdal2

@@ -1,93 +1,10 @@
 # syntax=docker/dockerfile:1
-FROM ruby:3.1.2 as base
-
-#------------------------------------------------------------------------------
-# GDAL setup
-# We don't need much for ffi-gdal...
-# https://trac.osgeo.org/gdal/wiki/BuildingOnUnixWithMinimizedDrivers
-#------------------------------------------------------------------------------
-FROM base as gdal_builder
-
-ARG GDAL_VERSION="2.4.4"
-ARG GDAL_TARBALL="gdal-${GDAL_VERSION}.tar.gz"
-
-WORKDIR /tmp
-
-RUN apt-get update -yqq \
-  && apt-get upgrade -yqq \
-  && apt-get install -yqq --no-install-recommends \
-  build-essential \
-  ca-certificates \
-  curl \
-  libgeos-dev \
-  libproj-dev \
-  librttopo-dev \
-  && rm -rf /var/lib/apt/lists/* \
-  && curl -sSf -L -O "https://github.com/OSGeo/gdal/releases/download/v${GDAL_VERSION}/${GDAL_TARBALL}" \
-  && curl -sSf -L -O "https://github.com/OSGeo/gdal/releases/download/v${GDAL_VERSION}/${GDAL_TARBALL}.md5" \
-  && md5sum --strict --check "${GDAL_TARBALL}.md5" \
-  && mkdir gdal \
-  && tar -zxvf $GDAL_TARBALL -C /tmp/gdal --strip-components=1 \
-  && rm ${GDAL_TARBALL} "${GDAL_TARBALL}.md5" \
-  && cd /tmp/gdal \
-  && ./configure \
-  --with-geos \
-  --with-geotiff=internal \
-  --with-libtiff=internal \
-  --with-libz=internal \
-  --with-threads \
-  --without-bsb \
-  --without-cfitsio \
-  --without-cryptopp \
-  --without-curl \
-  --without-ecw \
-  --without-expat \
-  --without-fme \
-  --without-freexl \
-  --without-gif \
-  --without-gnm \
-  --without-grass \
-  --without-grib \
-  --without-hdf4 \
-  --without-hdf5 \
-  --without-idb \
-  --without-ingres \
-  --without-jasper \
-  --without-jp2mrsid \
-  --without-jpeg \
-  --without-kakadu \
-  --without-libgrass \
-  --without-libkml \
-  --without-libtool \
-  --without-mrf \
-  --without-mrsid \
-  --without-mysql \
-  --without-netcdf \
-  --without-odbc \
-  --without-ogdi \
-  --without-openjpeg \
-  --without-pcidsk \
-  --without-pcraster \
-  --without-pcre \
-  --without-perl \
-  --without-pg \
-  --without-png \
-  --without-python \
-  --without-qhull \
-  --without-sde \
-  --without-sqlite3 \
-  --without-webp \
-  --without-xerces \
-  --without-xml2 \
-  && make \
-  && make install \
-  && cd /tmp \
-  && rm -rf gdal
+FROM ghcr.io/telus-agcg/ruby3.2-gdal2.4.4:1.0 as base
 
 #------------------------------------------------------------------------------
 # Dev setup 1
 #------------------------------------------------------------------------------
-FROM gdal_builder as dev_builder
+FROM base as dev_builder
 
 RUN gem update --system \
   && gem install bundler

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Agrian, Inc.
+Copyright (c) 2023 Telus Agriculture & Consumer Goods
 
 MIT License
 

data/README.md

@@ -45,14 +45,9 @@ For classes that are enabled with logging capabilities, you can turn logging on
 and off like `GDAL::RasterBand.logging_enabled = true`. If you're using ffi-gdal
 in Rails, you can `GDAL::Logger.logger = Rails.logger`.
 
-## Additional Libraries
-
-[ffi-gdal-extensions](https://github.com/agrian-inc/ffi-gdal-extensions) provides
-additional functionality, not provided in this core, GDAL-wrapper library.
-
 ## Contributing
 
-1. Fork it ( https://github.com/agrian-inc/ffi-gdal/fork )
+1. Fork it ( https://github.com/telus-agcg/ffi-gdal/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/ffi-gdal.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.name          = 'ffi-gdal'
   spec.version       = FFI::GDAL::VERSION
   spec.authors       = ['Steve Loveless']
-  spec.email         = %w[steve@agrian.com]
+  spec.email         = %w[steve.loveless@telusagcg.com]
   spec.summary       = 'FFI wrapper for GDAL/OGR.'
-  spec.homepage      = 'https://github.com/agrian-inc/ffi-gdal'
+  spec.homepage      = 'https://github.com/telus-agcg/ffi-gdal'
   spec.license       = 'MIT'
 
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do

data/lib/ffi/gdal/version.rb

@@ -2,6 +2,6 @@
 
 module FFI
   module GDAL
-    VERSION = '1.0.0'
+    VERSION = '1.0.2'
   end
 end

data/lib/gdal/extensions/all.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Dir[File.join(__dir__, '**/extensions/**/*.rb')].sort.each { |f| require f }
+Dir[File.join(__dir__, '**/*.rb')].sort.each { |f| require f }

data/lib/ogr/extensions/all.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Dir[File.join(__dir__, '**/extensions/**/*.rb')].sort.each { |f| require f }
+Dir[File.join(__dir__, '**/*.rb')].sort.each { |f| require f }

data/lib/ogr/extensions/geometry/extensions.rb

@@ -13,7 +13,7 @@ module OGR
           if spatial_reference.authority_code == '4326'
             self
           else
-            # NOTE: #clone here has overriden Ruby's clone and calls OGR_G_Clone;
+            # NOTE: #clone here has overridden Ruby's clone and calls OGR_G_Clone;
             # it's important to do this and
             as4326 = clone
             return unless as4326.transform_to!(OGR::SpatialReference.new.import_from_epsg(4326))
@@ -21,7 +21,7 @@ module OGR
             as4326
           end
 
-        self_as4326.self_as4326.buffer!(0) unless valid?
+        self_as4326 = self_as4326.buffer(0) unless valid?
 
         return unless self_as4326.point_on_surface.x
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gdal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Steve Loveless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -236,12 +236,13 @@ dependencies:
         version: '0.9'
 description:
 email:
-- steve@agrian.com
+- steve.loveless@telusagcg.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
+- ".github/dependabot.yml"
 - ".github/workflows/codacy.yml"
 - ".github/workflows/codeql.yml"
 - ".github/workflows/continuous-integration.yml"
@@ -267,7 +268,6 @@ files:
 - bin/rake
 - bin/rspec
 - bin/rubocop
-- bitbucket-pipelines.yml
 - docker-compose.yml
 - examples/extract_and_colorize.rb
 - examples/geometries.rb
@@ -302,7 +302,6 @@ files:
 - lib/ffi/cpl/xml_node.rb
 - lib/ffi/extensions/gdal/extensions.rb
 - lib/ffi/extensions/gdal/extensions/all.rb
-- lib/ffi/extensions/gdal/extensions/version.rb
 - lib/ffi/extensions/rttopo.rb
 - lib/ffi/extensions/rttopo/gbox.rb
 - lib/ffi/extensions/rttopo/geom.rb
@@ -476,10 +475,8 @@ files:
 - lib/ogr/style_tool.rb
 - rakelib/docker.rake
 - sorbet/rbi/hidden-definitions/errors.txt
-- tilt/gdal2.yml
-- tilt/gdal3.yml
 - tmp/.keep
-homepage: https://github.com/agrian-inc/ffi-gdal
+homepage: https://github.com/telus-agcg/ffi-gdal
 licenses:
 - MIT
 metadata:
@@ -499,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: FFI wrapper for GDAL/OGR.

data/bitbucket-pipelines.yml

@@ -1,16 +0,0 @@
-# You can use a Docker image from Docker Hub or your own container
-# registry for your build environment.
-image: agrian/ubuntugis-ruby:latest
-
-pipelines:
-  default:
-    - step:
-        script: # Modify the commands below to build your repository.
-          - ruby --version
-          - gem install bundler
-          - gem sources -a http://$AGRIAN_GEMS_USERNAME:$AGRIAN_GEMS_PASSWORD@gems.agrian.com/
-          - bundle config gems.agrian.com $AGRIAN_GEMS_USERNAME:$AGRIAN_GEMS_PASSWORD
-          - bundler --version
-          - bundle install
-          - bundle exec rake spec
-          # - bundle exec rubocop

data/lib/ffi/extensions/gdal/extensions/version.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module FFI
-  module GDAL
-    module Extensions
-      VERSION = '0.3.0'
-    end
-  end
-end

data/tilt/gdal2.yml

@@ -1,22 +0,0 @@
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: gdal2
-  labels:
-    app: gdal2
-spec:
-  restartPolicy: Never
-  concurrencyPolicy: Forbid
-  failedJobsHistoryLimit: 1
-  parallelism: 1
-  backoffLimit: 0
-  template:
-    metadata:
-      labels:
-        app: gdal2
-    spec:
-      restartPolicy: Never
-      containers:
-        - name: gdal2
-          image: ttl.sh/ffi-gdal-12345/5d7df36c-2e4d-42dd-a744-fc5959dffb7f

data/tilt/gdal3.yml

@@ -1,22 +0,0 @@
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: gdal3
-  labels:
-    app: gdal3
-spec:
-  restartPolicy: Never
-  concurrencyPolicy: Forbid
-  failedJobsHistoryLimit: 1
-  parallelism: 1
-  backoffLimit: 0
-  template:
-    metadata:
-      labels:
-        app: gdal3
-    spec:
-      restartPolicy: Never
-      containers:
-        - name: gdal3
-          image: ttl.sh/ffi-gdal-12345/ff64f94d-84fb-4762-a1f2-ce223da180b1