Skip to content

Commit

Permalink
Revamp contributing guide; freshen some other stale docs (#291)
Browse files Browse the repository at this point in the history
* Revamp contributing guide; freshen some other stale docs

* Add typos action

* Fix typos... once and for all ;)

* Remove extraneous step

* Apply suggestions from code review

Co-authored-by: Michael Kirk <[email protected]>

---------

Co-authored-by: Michael Kirk <[email protected]>
  • Loading branch information
ianthetechie and michaelkirk authored Oct 9, 2024
1 parent 93f4cac commit 9b44561
Show file tree
Hide file tree
Showing 19 changed files with 487 additions and 313 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/typos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Check for Typos

on:
pull_request:
branches: [ main ]

jobs:
typos:
runs-on: macos-14
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-ios-swiftformat
cancel-in-progress: true

steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Run typos
uses: crate-ci/[email protected]
235 changes: 1 addition & 234 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,234 +1 @@
# Contributing to Ferrostar

We're stoked that you're interested in working on Ferrostar!
This contribution guide will get you started developing in no time,
as well as provide some guidelines to follow when submitting an issue or PR.

## Best Practices for Contributions

We welcome contributions from community!
Due to the size and complexity of the code, below are some best practices that ensure smooth collaboration.

It is a good idea to discuss large proposed changes before proceeding to an issue ticket or PR.
The project team is active in the following forums:

* For informal chat discussions, visit the `#ferrostar` channel in the OSMUS Slack.
You can get an invite to the workspace at [slack.openstreetmap.us](https://slack.openstreetmap.us/).
* For larger discussions where it would be desirable to have wider input / a less ephemeral record,
consider starting a thread on [GitHub Discussions](https://github.com/stadiamaps/ferrostar/discussions).
This makes it easier to find and reference the discussion in the future.

### Testing

Both new features and bugfixes should update or add unit test cases where possible
to prevent regressions and demonstrate correctness.
This is particularly true of the common core.

We are a bit more lax with the frontend code as this may be difficult or impractical to test.
We have been gradually introducing snapshot testing on iOS as a way to overcome these difficulties,
but it's not perfect.
Suggestions welcome for Android.

### New Features

For new features, you should generally start by opening a new issue.
That will allow for separate tracking of discussion of the feature itself
and (if you're proposing code as well) the implementation of the feature.

### Bug Fixes

If you've identified a significant bug, or one that you don't intend to fix yourself,
please write up an issue ticket describing the problem.
For minor or straightforward bug fixes, feel free to proceed directly to a PR.

### Pull Request Tips

To speed up reviews, it's helpful if you enable edits from maintainers when opening the PR.
In the case of minor changes, formatting, or style nitpicks, we can make edits directly to avoid wasting your time.
In order to enable edits from maintainers, **you'll need to make the PR from a fork owned an individual**,
not an organization.
GitHub org-owned forks lack this flexibility.

Note: we enforce formatting checks on PRs.
If you forget to do this, CI will eventually fail on your PR.

## Preparing your Development Environment


To ensure that everything can be developed properly in parallel,
we use a monorepo structure.
This, combined with CI, will ensure that changes in the core must be immediately reflected in platform code
like Apple and Android.

Let's look at what's involved to get hacking on each platform.

### Rust

1. Install [Rust](https://www.rust-lang.org/).
If at all possible, install `rustup`.
We use [rust-toolchain.yml](common/rust-toolchain.yml)
to synchronize the toolchain and install targets automatically
(otherwise you will need to manage toolchains manually).
2. Open the cargo workspace (`common/`) in your preferred editing environment.

The Rust project is a cargo workspace,
and nothing beyond the above should be needed to start hacking!

Before pushing, run the following in the `common` folder:

1. Run `cargo fmt` to automatically format any new rust code.
2. Run `cargo insta review` to update snapshot testing changes.
3. Run `cargo test` to validate testing and ensure snapshot changes were correctly applied by step 2.
4. Manually bump the version on the ferrostar Cargo.toml at `common/ferrostar/Cargo.toml`. If you forget to do this and make breaking changes, CI will fail.
if you don't.

### Web

Perform all commands unless otherwise noted from the `web` directory.

1. Install `wasm-pack`:

```shell
cargo install wasm-pack
```

2. Build the WASM package for the core:

```shell
npm run prepare:core
```

3. Install dependencies:

```shell
npm install
```

4. Run a local dev server or do a release build:

```shell
# This will start a local web server for the demo app with hot reload
npm run dev

# Or you can do a release build (we test this in CI)
npm run build
```

### iOS

1. Install the latest version of Xcode.
2. Install the Xcode Command Line Tools.

```shell
xcode-select --install
```

3. Install [`swiftformat`](https://github.com/nicklockwood/SwiftFormat).
4. Since you're developing locally, set `let useLocalFramework = true` in `Package.swift`.
(TODO: Figure out a way to extract this so it doesn't get accidentally committed.)
5. Run the iOS build script:

```shell
cd common
./build-ios.sh
```

**IMPORTANT:** every time you make changes to the common core,
you will need to run [`build-ios.sh`](common/build-ios.sh) to see your changes on iOS!
We want to integrate this into the Xcode build flow in the future,
but at the time of this writing,
it is not possible with the Swift package flow.
Further, the "normal" Xcode build flow always assumes xcframeworks can't change during build,
so it processes them before any other build rules.
Given these limitations, we opted for a shell script until further notice.

5. Open the Swift package in Xcode.
(NOTE: Due to the quirks of how SPM is designed,
Package.swift must live in the repo root.
This makes the project view in Xcode slightly more cluttered,
but there isn't much we can do about this given how SPM works.)

Run `swiftformat .` from the `apple` directory before committing
to ensure consistent formatting.

### Android

1. Install [Android Studio](https://developer.android.com/studio).
2. Install cargo-ndk to allow gradle to build the local library `libferrostar.so` and `libuniffi_ferrostar.so`.
With cargo-ndk installed you can load and sync Android Studio then build the demo app allowing gradle to
automatically build what it needs.

```sh
cargo install cargo-ndk
```

3. Ensure that the latest NDK is installed
(refer to the `ndkVersion` number in [`core/build.gradle`](android/core/build.gradle)
and ensure you have the same version available).
This is easiest to install via Android Studio's SDK Manager (under SDK Tools > NDK).
4. Set up Github Packages authentication if you haven't already done so.

- Get a Personal Access Token with permission to read packages
- Save your GitHub username and PAT in a Gradle properties file (ex: ~/.gradle/gradle.properties) like so:
- See [GitHub's guide](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-to-github-packages) for more details.

```
gpr.user=username
gpr.token=token
```
5. Open the Gradle workspace ('android/') in Android Studio.
Gradle builds automatically ensure the core is built,
so there are no funky scripts needed as on iOS.

Run the `ktfmtFormat` gradle action before committing to ensure consistent formatting.

## Writing & Running Tests

### Common Core

Run `cargo test -p ferrostar` from within the `common` directory to run tests.

### Web

Run `wasm-pack test --firefox --headless ferrostar --no-default-features --features wasm_js` from within the `common` directory to run tests.

### iOS

Run unit tests as usual from within Xcode.

### Android

Android uses both tests and androidTests (connectedChecks) to verify functionality. Included in normal unit tests are paparazzi snapshot tests for UI components.

#### Recording Snapshots

Run the gradle task `recordPaparazziDebug`. This can be done from the gradle menu under `verification`.

## Code Conventions

* Format all Rust code using `cargo fmt`
* Run `cargo clippy` and either fix any warnings or document clearly why you think the linter should be ignored
* All iOS code must be written in Swift
* SwiftFormat is used to automatically format all swift code. This must be run manually from within the project folder using the command line tool `swiftformat .`. For more information on installation see [SwiftFormat/Installation](https://github.com/nicklockwood/SwiftFormat?tab=readme-ov-file#how-do-i-install-it)
* All Android code must be written in Kotlin
* ktfmt is used to automatically format all kotlin code. This can be run using the `ktfmtFormat` step under `formatting` in the gradle menu.

## Changelog Conventions

NOTE: We'll be *extremely* loose with this
until we have solid beta quality releases for both iOS and Android.

What warrants a changelog entry?

- Any change that affects the public API, visual appearance or user security *must* have a changelog entry
- Any performance improvement or bugfix *should* have a changelog entry
- Any contribution from a community member *may* have a changelog entry, no matter how small
- Any documentation related changes *should not* have a changelog entry
- Any regression change introduced and fixed within the same release *should not* have a changelog entry
- Any internal refactoring, technical debt reduction, test, or benchmark related change *should not* have a changelog entry

How to add your changelog?

- Edit the [`CHANGELOG.md`](CHANGELOG.md) file directly, inserting a new entry at the top of the appropriate list
- Any changelog entry should be descriptive and concise; it should explain the change to a reader without context

The contributing guide has been moved to the [Ferrostar Book](https://stadiamaps.github.io/ferrostar/contributing.html).
5 changes: 5 additions & 0 deletions _typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[default.extend-words]
rememberable = "rememberable"

[files]
extend-exclude = ["**/build/*", "*.pbxproj", "**/dist/*", "guide/**/*.js"]
2 changes: 1 addition & 1 deletion android/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ mavenPublishing {

pom {
name = "Ferrostar Core"
description = "Core libray, models, and navigation business logic for Ferrostar"
description = "Core library, models, and navigation business logic for Ferrostar"
commonPomConfig(it)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn

public var minimumSafeAreaInsets: EdgeInsets

/// Create a dynamically orienting navigation view. This view automatically arranges child views for both portait
/// Create a dynamically orienting navigation view. This view automatically arranges child views for both portrait
/// and landscape orientations.
///
/// - Parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public struct NavigatingInnerGridView: View, CustomizableNavigatingInnerGridView
/// The default navigation inner grid view.
///
/// This view provides all default navigation UI views that are used in the open map area. This area is defined as
/// between the header/banner view and footer/arrival view in portait mode.
/// between the header/banner view and footer/arrival view in portrait mode.
/// On landscape mode it is the trailing half of the screen.
///
/// - Parameters:
Expand Down
2 changes: 1 addition & 1 deletion guide/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Ian Wagner"]
language = "en"
multilingual = false
src = "src"
title = "The Ferrostar User Guide"
title = "The Ferrostar Book"

[preprocessor]

Expand Down
47 changes: 25 additions & 22 deletions guide/src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,31 @@
[Terminology and Conventions](./terminology-and-conventions.md)
[Platform Support Targets](./platform-support-targets.md)

# Getting Started

- [iOS](./ios-getting-started.md)
- [Android](./android-getting-started.md)
- [Web](./web-getting-started.md)
- [Rust](./rust-getting-started.md)

# Customization

- [General](./general-customization.md)
- [Navigation Behavior](./configuring-the-navigation-controller.md)
- [SwiftUI](./swiftui-customization.md)
- [Jetpack Compose](./jetpack-compose-customization.md)
- [Android Foreground Services](./android-foreground-service.md)
- [Web](./web-customization.md)

# Architecture

---

# User Guide

- [Quick Start Tutorials](./getting-started.md)
- [iOS](./ios-getting-started.md)
- [Android](./android-getting-started.md)
- [Web](./web-getting-started.md)
- [Rust](./rust-getting-started.md)
- [Customization](./general-customization.md)
- [Navigation Behavior](./configuring-the-navigation-controller.md)
- [Route Providers](./route-providers.md)
- [Location Providers](./location-providers.md)
- [SwiftUI](./swiftui-customization.md)
- [Jetpack Compose](./jetpack-compose-customization.md)
- [Android Foreground Services](./android-foreground-service.md)
- [Web](./web-customization.md)

# Contributor Guide

- [Contributing to Ferrostar](./contributing.md)
- [Developer Environment Setup](./dev-env-setup.md)
- [Testing](./testing.md)
- [Architecture Overview](./architecture.md)
- [Route Providers](./route-providers.md)
- [Location Providers](./location-providers.md)

# Appendices
---

- [Routing and Basemap Vendors](./vendors.md)
[Routing and Basemap Vendors](./vendors.md)
2 changes: 1 addition & 1 deletion guide/src/android-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ and then initialize later once the `Context` is available.
// Instance variable definition
private lateinit var locationProvider: FusedLocationProvider

// Later when the activity loads and a context is avaialable
// Later when the activity loads and a context is available
locationProvider = FusedLocationProvider(context = this)
```

Expand Down
Loading

0 comments on commit 9b44561

Please sign in to comment.