Skip to content

Commit

Permalink
Merge pull request #373 from moosetechnology/development
Browse files Browse the repository at this point in the history
Update master for release
  • Loading branch information
ClotildeToullec authored Nov 26, 2021
2 parents 50db40a + 80ba90f commit 49a8626
Show file tree
Hide file tree
Showing 447 changed files with 16,024 additions and 8,097 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This is a basic workflow to help you get started with Actions

name: Continuous

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the development branch
on:
push:
branches:
- development

jobs:
build:
runs-on: ubuntu-latest
env:
PROJECT_NAME: ${{ matrix.smalltalk }}-Midas
strategy:
matrix:
smalltalk: [ Pharo64-9.0 ]
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v2
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
shell: bash
timeout-minutes: 15

- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: package
run: |
mv /home/runner/.smalltalkCI/_builds/* .
mv TravisCI.image $PROJECT_NAME.image
mv TravisCI.changes $PROJECT_NAME.changes
zip -r $PROJECT_NAME.zip $PROJECT_NAME.image $PROJECT_NAME.changes *.sources pharo.version
ls
- name: Update Release
# You may pin to the exact commit or the version.
# uses: johnwbyrd/update-release@1d5ec4791e40507e5eca3b4dbf90f0b27e7e4979
uses: johnwbyrd/[email protected]
with:
release: 'continuous'
token: ${{ secrets.GITHUB_TOKEN }}
files: ${{ env.PROJECT_NAME }}.zip
25 changes: 25 additions & 0 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Daily-development

on:
schedule:
- cron: '0 0 * * *'

jobs:
build:
runs-on: ubuntu-latest
env:
PROJECT_NAME: Midas-development
strategy:
matrix:
smalltalk: [ Pharo64-9.0 ]
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v2
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
shell: bash
timeout-minutes: 15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27 changes: 27 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the development branch
on:
pull_request:
branches: [development]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
smalltalk: [ Pharo64-9.0 ]
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v2
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
shell: bash
timeout-minutes: 15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13 changes: 11 additions & 2 deletions .smalltalk.ston
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
SmalltalkCISpec {
#loading : [
SCIMetacelloLoadSpec {
#baseline : 'Midas',
#baseline : 'MooseIDE',
#directory : 'src',
#load : [ 'default' ],
#platforms : [ #pharo ],
#onConflict : #useIncoming,
#onUpgrade : #useIncoming
}
]
],
#testing : {
#exclude : {
#classes : [ #MiInspectorBrowserTest ]
},
#coverage : {
#packages : [ 'MooseIDE.*' ],
#format : #lcov
}
}
}
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

23 changes: 15 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
# Midas
# MooseIDE

Master: [![Build Pass](https://api.travis-ci.com/moosetechnology/Midas.svg?branch=master)](https://travis-ci.com/github/moosetechnology/Midas)
[![Moose version](https://img.shields.io/badge/Moose-8-%23aac9ff.svg)](https://github.com/moosetechnology/Moose)
[![Coverage Status](https://coveralls.io/repos/github/moosetechnology/MooseIDE/badge.svg)](https://coveralls.io/github/moosetechnology/MooseIDE) [![development](https://github.com/moosetechnology/MooseIDE/actions/workflows/daily.yml/badge.svg)](https://github.com/moosetechnology/MooseIDE/actions/workflows/daily.yml) [![Moose version](https://img.shields.io/badge/Moose-8-%23aac9ff.svg)](https://github.com/moosetechnology/Moose)

New Tools for Moose

## Installation

### From the Pharo Launcher

![downloadMidas](https://user-images.githubusercontent.com/6225039/83118958-5bf9e680-a0cf-11ea-8a17-66d101995d27.gif)
1. **New** (image)
2. **Official distributions**
3. **Moose Suite 9.0 (development)**
4. (optionally change **Image name:**)
5. **Create image**

![Screen capture of Pharo Launcher to make MooseIDE image](https://user-images.githubusercontent.com/33934979/124268297-9e46f000-db39-11eb-8626-ab578dd16ffb.png)

### From a Pharo Image

```smalltalk
Metacello new
baseline: 'Midas';
repository: 'github://moosetechnology/Midas:master/src';
load.
[ Metacello new
baseline: 'Moose';
repository: 'github://moosetechnology/MooseIDE:development/src';
load ]
on: MCMergeOrLoadWarning
do: [ :warning | warning load ]
```
121 changes: 121 additions & 0 deletions roadmapMoose.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
(updated on oct. 13, 2021)

# QueryBrowser

## Result list

bottom list is currently sorted by "kind of entities" and is "read-only"

- we want also a hierarchical tree of entities:
```
> package1
> class11
> class12
method121
method122
> package2
```
(note: with workspace browser, this part could be detached from the QueryBrowser to become a simple EntityListPresenter ...)

# Durden workspace

(Santi's stuff)
It allows to group several tools in one window.

It is a MiBrowser, so it listens and writes on bus(es)

It has an "internal bus" that it's children browsers listen and write

The workspace make the bridge between external bus(es) and its internal bus:
- takes incoming entities on external bus and send them on internal bus,
- takes entities on internal bus to propagate them on external bus(es).
- propagation on internal bus is automatic,
- propagation to external bus(es) is on demand

# Property Browser

A tool to define properties. A property has:
- a name
- a boolean query to decide if an entity has this property or not
- a color (optional?)

Note: Property is a kind of "virtual tag", or a tag computed on the fly but not stored in the model

The query will be taken from the Query Browser, for example:
Property: name="someName", color=red, query=Q1

So we need a mechanism to share queries between different tools.
This tool can ask the QueryBrowser, what are the queries available and allow to select one of the query to create a property from it

# TagBrowser

Possibility to define tags from properties

# Hierarchical Map with properties

Displays incoming entities in a hierarchicalView https://github.com/ObjectProfile/HierarchicalVisualizations

Has a list of properties (taken from PropertyBrowser)

For each displayed entity, if it matches one property query, will give the color of the property to the entity.

If an entity match several queries, 2 options:
- give a specific color (black, gray, red)
- choose the first one

# Distribution Map

We want a distribution map browser

Probably based on the prototype in https://github.com/NicolasAnquetil/HierarchicalVisualizations, not on the telescope one

Will work somehow like the **Hierarchical Map with properties** for the properties, but the Distribution map wants exaclty 2 levels of entities: Containers and members
So we need to force this:
- entities coming from the bus should be of that form => user responsible for selectyng the right entities with the proper query
- entities coming from the bu are the containers and the tool accept one query that will produce members for each of these incoming container

# Favorites Browser

A tool to record some favorites "things" that the user like:
- launching a browser
- running a favorite query and automatically propagate the result on the bus(es)
locations)
- running a Property ???

# System complexity

Recreate the system complexity browser (3 metrics displayed with width, height, and color)
Entites are displayed in a tree

Possibly accept colored properties (with only 2 metrics with width and height)

Starting at a given level, containement is not shown as a tree, but as a HierarchicalVisualization

# Double Dispatch buses

When a tool wants to send an entity on a bus, it should ask this entity what bus to use.
Their will be buses specialiazed for all types of entities (including a generic bus "specialized" for MooseEntity)

And when a tool is expecting entities of a special type, it should ask the class of this entity what bus can carry it and then ask the application for available buses of this type.

We will still be able to have several buses for the same type (see issue: (https://github.com/moosetechnology/MooseIDE/issues/320)[https://github.com/moosetechnology/MooseIDE/issues/320]

# Propagation strategy buses

We could have at least 3 kind of buses:

- push bus: when data is written on the bus, it immediately transmits it to all tools attached to it
- delayed bus: when data is written on the bus, it stores it and only transmits when there is an explicit "flush" from the producer (allow to work with the "Propagate" button of the tools)
- pull buses, bus stores data and does not transmit it unless explicitly asked by a receiver tool

The last 2 are a bit similar: one is a flush from the producer to all consumers the other is a flush from the consumer only to itself.

This will allow to have:
- an internal bus for MooseWorkspace that transmit data immediately to all tools in the workspace (*push* internal bus) ;
- bus for separate tools that tranmit only on request (*delayed bus* + Propagate button) ; and
- a bus for some specific cases where we want to share data on demand:
- to share queries (not their result, but the query itself),
- share the properties defined in **Property Browser**
- for santi to share is configurations


Loading

0 comments on commit 49a8626

Please sign in to comment.