Skip to content

Commit

Permalink
Revert "replacing beastmaster with chaos wrangler BadIdeaFactory#113"
Browse files Browse the repository at this point in the history
This reverts commit 091dcfa.
  • Loading branch information
sugaroverflow committed Aug 13, 2020
1 parent 091dcfa commit 14c13df
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ by the Treasure Goblin.
- lore: this branch is for tracking documentation and minutes. It is managed
by the Keeper of Lore.
- projects: this branch is for keeping track of projects and relevant
documents or agreements. It is managed by the Chaos Wrangler.
documents or agreements. It is managed by the Beastmaster.
- popularity: this branch is for keeping track of communications and marketing
materials such as emoji, logos, and catch phrases. It is managed by The
Popular One.
Expand Down Expand Up @@ -198,5 +198,5 @@ Use the [Tome of Knowledge: Overmind](https://github.com/BadIdeaFactory/corporat
## How do I (Keeper of Lore)...
Use the [Tome of Knowledge: Keeper of Lore](https://github.com/BadIdeaFactory/corporate/wiki/Tome-of-Knowledge:-Keeper-of-Lore)

## How do I (Chaos Wrangler)...
Use the [Tome of Knowledge: Chaos Wrangler](https://github.com/BadIdeaFactory/corporate/wiki/Tome-of-Knowledge:-Chaos Wrangler)
## How do I (Beastmaster)...
Use the [Tome of Knowledge: Beastmaster](https://github.com/BadIdeaFactory/corporate/wiki/Tome-of-Knowledge:-Beastmaster)
2 changes: 1 addition & 1 deletion applications/elections/general_candidate.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- [ ] Treasure Goblin
- [ ] Keeper of Lore
- [ ] Secretary of Code
- [ ] Chaos Wrangler
- [ ] Beastmaster
- [ ] The Popular One

## Why are you qualified?
Expand Down
26 changes: 13 additions & 13 deletions documents/operating.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SECTION 0: 📓📓📓 Definitions 📓📓📓
* The "**Hive Mind**" shall mean the "board of directors" of the Company, as defined by Pennsylvania state law. The Hive Mind shall consist of all current Corporate Overlords of the Company.
* "**Plotting Session**" shall mean a "meeting of the board of directors" of the Company, as defined by Pennsylvania state law.
* "**Quorum**" shall mean the presence of at least 1/2 + 1 of the company's Corporate Overlords.
* "**Chain of Command**" shall refer to the following order: Overmind, Undermind, Keeper of Lore, Treasure Goblin, Chaos Wrangler, The Popular One, Secretary of Code.
* "**Chain of Command**" shall refer to the following order: Overmind, Undermind, Keeper of Lore, Treasure Goblin, Beastmaster, The Popular One, Secretary of Code.
* "**Operating Agreement**" shall refer to the official version of this document to be held in a file named `operating.md` in the `documents` directory of the `master` branch of the `corporate` repository within the `BadIdeaFactory` team hosted on GitHub. (As of July 2017, the described version of the file may be located at: https://github.com/BadIdeaFactory/corporate/blob/master/documents/operating.md)

### Support Categories
Expand Down Expand Up @@ -123,15 +123,15 @@ A Corporate Overlord exits hibernation immediately by attending a plotting sessi
Anybody with ownership over a BIFFUD Project is considered a BIFFUD Member. Members must sign the Membership Contract found in `/documents/member_agreement.md`.

### Removing Members
Members may be removed from the organization by the Chaos Wrangler when they are no longer associated with any BIFFUD projects.
Members may be removed from the organization by the Beastmaster when they are no longer associated with any BIFFUD projects.

### Adding Accomplices
Anybody with an accepted Pull Request in a BIFFUD project is automatically considered an Accomplice. Before a Pull Request can be approved, the contributor must submit a signed Contributor License Agreement found in `/documents/accomplice_agreement.md`.

Project owners can also indicate who their accomplices are, even if they don't open pull requests (there are many ways to contribute to a project that doesn't involve code).

### Removing Accomplices
Accomplices can be removed by the Chaos Wrangler if it decides that is what is best.
Accomplices can be removed by the beastmaster if it decides that is what is best.

### Corporate Overlord Responsibilities
Bad Idea Factory is a Limited Liability Corporation, which means that partnership can't _just_ be about the spirit or the lulz -- partners have legal responsibilities, ownership, and control over the Company direction.
Expand Down Expand Up @@ -166,7 +166,7 @@ In addition to base expectations, the following positions are to be held by Corp

- **Secretary of Code:** Ensures that corporate defined commit protocols are followed in all BIFFUD projects, as well as `corporate`.

- **Chaos Wrangler:** Makes certain decisions related to BIFFUD projects and ensures that the Corporate Overlords are aware of the progress and activity of BIFFUD projects.
- **Beastmaster:** Makes certain decisions related to BIFFUD projects and ensures that the Corporate Overlords are aware of the progress and activity of BIFFUD projects.

- **The Popular One:** Handles public communication. Runs BIFFUD social media accounts with input from other interested Corporate Overlords.

Expand All @@ -188,7 +188,7 @@ All "**Owners**"" of a project must be Members, and the percentages and specific

The Ownership Contract must specify participation expectations and ownership percentages, as well as guidelines for how potential profits should be distributed.

Changes to project ownership must be communicated to The Chaos Wrangler.
Changes to project ownership must be communicated to The Beastmaster.

### Project Resources
Resources required to complete or support a project can come from several different sources:
Expand All @@ -204,7 +204,7 @@ Resources required to complete or support a project can come from several differ
5. **Raw Capitalism.** Apparently people think it's a good idea to hire a company called Bad Idea Factory. We're as surprised as you. Projects that bring in revenue in return for services are bound by the same rules as other projects in terms of how their money can be allocated.

### Disputes Between Project Owners
If project owners disagree, the Chaos Wrangler will attempt to address the disagreement. If the Chaos Wrangler fails to create harmony, the Chaos Wrangler proposes a solution and if either the Undermind or Overmind approve it, the Owners in conflict must either accept that solution or mutually agree on an alternative.
If project owners disagree, the Beastmaster will attempt to address the disagreement. If the Beastmaster fails to create harmony, the Beastmaster proposes a solution and if either the Undermind or Overmind approve it, the Owners in conflict must either accept that solution or mutually agree on an alternative.

### Retiring a BIFFUD Project
All BIFFUD projects, regardless of how they are resourced and supported, must be maintained and owned by at least one Member. If a project no longer has a Member interested in owning it or if The Hive decides that the project should be removed from The Company, a motion may be passed to change the status to retired.
Expand Down Expand Up @@ -252,9 +252,9 @@ The following numbered clauses apply to all BIFFUD projects unless explicitly ap

2. All BIFFUD projects must have the language written in `documents/federated_contributing.md` inserted into a CONTRIBUTING.md file at the root level of the project unless explicitly approved otherwise by the Corporate Overlords during project approval or at a later date during a Plotting Session.

3. Copyright and patent rights for all potential code or other creative works with a BIFFUD project must be granted to BIFFUD before it can be incorporated into a project, unless the Chaos Wrangler gives their approval.
3. Copyright and patent rights for all potential code or other creative works with a BIFFUD project must be granted to BIFFUD before it can be incorporated into a project, unless the Beastmaster gives their approval.

The Hive Mind has the ability to transfer Intellectual Property between BIFFUD and any external source (with approval of project owners) through approval of the Overmind, Undermind, and Chaos Wrangler. The Keeper of Lore is responsible for ensuring that documentation regarding the transfer is appropriately cataloged in `corporate`
The Hive Mind has the ability to transfer Intellectual Property between BIFFUD and any external source (with approval of project owners) through approval of the Overmind, Undermind, and Beastmaster. The Keeper of Lore is responsible for ensuring that documentation regarding the transfer is appropriately cataloged in `corporate`

---------------------------------------------------------------------
SECTION 4: 💵💵💵 MONEY 💵💵💵
Expand All @@ -277,7 +277,7 @@ with any expectation of ownership of BIFFUD.

### Project Resources
The Hive Mind is responsible for allocating financial support to Projects.
Project owners must select a single person to be the project's "Comptroller" who is responsible for approving any invoices associated with a project and working with the Chaos Wrangler and Treasure Goblin to receive access to centralized services or financial reimbursement, depending on the nature of the allocation.
Project owners must select a single person to be the project's "Comptroller" who is responsible for approving any invoices associated with a project and working with the Beastmaster and Treasure Goblin to receive access to centralized services or financial reimbursement, depending on the nature of the allocation.

Invoices that are not approved by a project's Comptroller will not be compensated unless they are explicitly approved by the Treasure Goblin.

Expand Down Expand Up @@ -450,13 +450,13 @@ The following decisions will require a formal input from the Hive Mind.

The GitHub processes for each decision are outlined in CONTRIBUTING.md and those processes should be followed.

- **Adding projects (Preliminary):** GitHub (needs Apathetic Support). This type of request is made by anybody who wants to submit their project or idea to BIFFUD for approval to become an official BIFFUD project. Upon preliminary approval the code base is incorporated into the BIFFUD repository and the Chaos Wrangler provides the project owners with a biffud.com subdomain.
- **Adding projects (Preliminary):** GitHub (needs Apathetic Support). This type of request is made by anybody who wants to submit their project or idea to BIFFUD for approval to become an official BIFFUD project. Upon preliminary approval the code base is incorporated into the BIFFUD repository and the Beastmaster provides the project owners with a biffud.com subdomain.

- **Adding projects:** Plotting Session (needs Strong Consensus). If the vote passes, the steps outlined in the preliminary vote description are invoked. The listed owners of the project are made Members and onboarded by the Chaos Wrangler. The project budget is given to the Treasure Goblin for categorization. The Chaos Wrangler also now has permission to give access to any approved resources as required by the project.
- **Adding projects:** Plotting Session (needs Strong Consensus). If the vote passes, the steps outlined in the preliminary vote description are invoked. The listed owners of the project are made Members and onboarded by the Beastmaster. The project budget is given to the Treasure Goblin for categorization. The Beastmaster also now has permission to give access to any approved resources as required by the project.

- **Updating projects (Preliminary):** GitHub (needs Apathetic Support). This type of request is made by Owners of a project who want to update their project's application file after it has been approved.

- **Updating projects:** GitHub (with no money changes; needs Chaos Wrangler Approval) or Plotting Session (needs Strong Consensus). Any change that will require additional BIFFUD resources cannot be approved by the Chaos Wrangler; it requires Strong Consensus during a Plotting Session.
- **Updating projects:** GitHub (with no money changes; needs Beastmaster Approval) or Plotting Session (needs Strong Consensus). Any change that will require additional BIFFUD resources cannot be approved by the Beastmaster; it requires Strong Consensus during a Plotting Session.

- **Removing projects:** Plotting Session (needs Strong Consensus). If a project has been voted for removal from BIFFUD, the project must be removed from BIFFUD servers and team repository. The transfer plan and timeline should be specified as part of the vote. If it is not, the timeline is one month and the intent is to transfer related code and data to project owners.

Expand Down Expand Up @@ -499,7 +499,7 @@ Here's a summary table:
| + project (plm.) | Apathetic Support | GitHub |
| + project | Strong Consensus | Plotting Ssn |
| ~ project (plm.) | Apathetic Support | GitHub |
| ~ project (no $) | Chaos Wrangler | GitHub |
| ~ project (no $) | BeastMaster | GitHub |
| ~ project | Strong Consensus | Plotting Ssn |
| - project | Strong Consensus | Plotting Ssn |
| + overlord | Strong Consensus | Plotting Ssn |
Expand Down
2 changes: 1 addition & 1 deletion records/elections/candidates/2019_06_16/Khalid_Fatima.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Fatima Khalid
- [ ] Treasure Goblin
- [ ] Keeper of Lore
- [ ] Secretary of Code
- [x] Chaos Wrangler
- [x] Beastmaster
- [ ] The Popular One

## Why are you qualified?
Expand Down
8 changes: 4 additions & 4 deletions roles/beastmaster.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Chaos Wrangler
## Beastmaster

**The Chaos Wrangler** is all about helping unlock the potential of our projects. This means helping them start, keep moving, share their stories, obtain resources, and contribute back to BIFFUD.
**The Beastmaster** is all about helping unlock the potential of our projects. This means helping them start, keep moving, share their stories, obtain resources, and contribute back to BIFFUD.

### Example Chaos Wrangler visions:
### Example Beastmaster visions:

1. Method for keeping track of what projects need.
2. Establishing systems for projects to obtain additional resources needed for their operation.
Expand All @@ -16,7 +16,7 @@

... and thinking of more things for this list

### Example Chaos Wrangler tasks:
### Example Beastmaster tasks:

* Keeping in touch with projects and making project owners feel appropriately loved and cared about.
* Keeping morale up across projects!
Expand Down

0 comments on commit 14c13df

Please sign in to comment.