Skip to content

Commit

Permalink
renames, from the old bitrise-cli to the new, official bitrise to…
Browse files Browse the repository at this point in the history
…ol name
  • Loading branch information
viktorbenei committed Aug 5, 2015
1 parent 0fc0102 commit 2df0d40
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
_temp/
bitrise-cli
bitrise
.bitrise
.bitrise.secrets.yml
_bin
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
ENV GOPATH /go
ENV PATH /go/bin:$PATH

RUN mkdir -p /go/src/github.com/bitrise-io/bitrise-cli
COPY . /go/src/github.com/bitrise-io/bitrise-cli
RUN mkdir -p /go/src/github.com/bitrise-io/bitrise
COPY . /go/src/github.com/bitrise-io/bitrise

WORKDIR /go/src/github.com/bitrise-io/bitrise-cli
WORKDIR /go/src/github.com/bitrise-io/bitrise
# godep
RUN go get -u github.com/tools/godep
RUN go install github.com/tools/godep
Expand All @@ -22,6 +22,6 @@ RUN godep restore
RUN go install

# include _temp/bin in the PATH
ENV PATH /go/src/github.com/bitrise-io/bitrise-cli/_temp/bin:$PATH
ENV PATH /go/src/github.com/bitrise-io/bitrise/_temp/bin:$PATH

CMD bitrise-cli --version
CMD bitrise --version
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Bitrise CLI

[![Join the chat at https://gitter.im/bitrise-io/bitrise-cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bitrise-io/bitrise-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/bitrise-io/bitrise](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bitrise-io/bitrise?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

**Technology Preview:** this repository is still under active development, breaking changes are expected and feedback is greatly appreciated!

Expand All @@ -14,15 +14,15 @@ Part of the Bitrise Continuous Integration, Delivery and Automations Stack.

## Install and Setup

Check the latest release for instructions at: [https://github.com/bitrise-io/bitrise-cli/releases](https://github.com/bitrise-io/bitrise-cli/releases)
Check the latest release for instructions at: [https://github.com/bitrise-io/bitrise/releases](https://github.com/bitrise-io/bitrise/releases)


## Tutorials and Examples

You can find examples in the [_examples](https://github.com/bitrise-io/bitrise-cli/tree/master/_examples) folder.
You can find examples in the [_examples](https://github.com/bitrise-io/bitrise/tree/master/_examples) folder.

If you're getting started you should start with [_examples/tutorials](https://github.com/bitrise-io/bitrise-cli/tree/master/_examples/tutorials),
this should guide you through the basics, while you'll already use `bitrise-cli` (requires installed `bitrise-cli`).
If you're getting started you should start with [_examples/tutorials](https://github.com/bitrise-io/bitrise/tree/master/_examples/tutorials),
this should guide you through the basics, while you'll already use `bitrise` (requires installed `bitrise`).

## Development Guideline

Expand Down
14 changes: 7 additions & 7 deletions _changelogs/0.9.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

* __BREAKING__ : `.bitrise.secrets.yml` 's syntax changed, to match the environments syntax used everywhere else. This means that instead of directly specifying `is_expand` at the same level as the key and value you should now move this into an `opts:` section, just like in every other `envs` list in `bitrise.yml`.
* __NEW__ : dependency management built into `bitrise.yml` syntax. Right now only `brew` is supported, on OS X, but this will be expanded.
* if a step or a version can't be found in the local cache from a step library `bitrise-cli` will now update the local cache before failing with "step not found"
* if a step or a version can't be found in the local cache from a step library `bitrise` will now update the local cache before failing with "step not found"
* greatly improved logs, colored step sections and step run summaries. It starts to look decent and is much more helpful than the previous log outputs.
* updated `setup` - only the Xcode Command Line tools are required now, if no full Xcode found it'll print a warning message about it but you can still use `bitrise-cli`.
* updated `setup` - only the Xcode Command Line tools are required now, if no full Xcode found it'll print a warning message about it but you can still use `bitrise`.
* quite a lot of minor bug fixes


Expand All @@ -13,22 +13,22 @@
To install this version, run the following commands (in a bash shell):

```
curl -L https://github.com/bitrise-io/bitrise-cli/releases/download/0.9.6/bitrise-cli-$(uname -s)-$(uname -m) > /usr/local/bin/bitrise-cli
curl -L https://github.com/bitrise-io/bitrise/releases/download/0.9.6/bitrise-$(uname -s)-$(uname -m) > /usr/local/bin/bitrise
```

Then:

```
chmod +x /usr/local/bin/bitrise-cli
chmod +x /usr/local/bin/bitrise
```

The first time it's mandatory to call the `setup` after the install,
and as a best practice you should run the setup every time you install a new version of `bitrise-cli`.
and as a best practice you should run the setup every time you install a new version of `bitrise`.

Doing the setup is as easy as:

```
bitrise-cli setup
bitrise setup
```

Once the setup finishes you have everything in place to use `bitrise-cli`.
Once the setup finishes you have everything in place to use `bitrise`.
10 changes: 5 additions & 5 deletions _changelogs/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
To install this version, run the following commands (in a bash shell):

```
curl -L https://github.com/bitrise-io/bitrise-cli/releases/download/{{version}}/bitrise-cli-$(uname -s)-$(uname -m) > /usr/local/bin/bitrise-cli
curl -L https://github.com/bitrise-io/bitrise/releases/download/{{version}}/bitrise-$(uname -s)-$(uname -m) > /usr/local/bin/bitrise
```

Then:

```
chmod +x /usr/local/bin/bitrise-cli
chmod +x /usr/local/bin/bitrise
```

The first time it's mandatory to call the `setup` after the install,
and as a best practice you should run the setup every time you install a new version of `bitrise-cli`.
and as a best practice you should run the setup every time you install a new version of `bitrise`.

Doing the setup is as easy as:

```
bitrise-cli setup
bitrise setup
```

Once the setup finishes you have everything in place to use `bitrise-cli`.
Once the setup finishes you have everything in place to use `bitrise`.
2 changes: 1 addition & 1 deletion _examples/tutorials/inputs-outputs-envs/bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ app:
workflows:
example-envs:
# You can run this workflow with:
# bitrise-cli run example-envs
# bitrise run example-envs
envs: []
steps:
- https://bitbucket.org/bitrise-team/bitrise-new-steps-spec::script@0.9.0:
Expand Down
8 changes: 4 additions & 4 deletions _examples/tutorials/steps-and-workflows/bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ workflows:

basics:
# You can run this workflow with:
# bitrise-cli run basics
# bitrise run basics
#
# All of the following steps in this workflow will do exactly the
# same thing, it demonstrates how you can define a step's ID
Expand Down Expand Up @@ -64,7 +64,7 @@ workflows:
direct-url:
# You can run this workflow with:
# bitrise-cli run direct-url
# bitrise run direct-url
#
# This workflow shows how to use steps with specifying the
# step's git clone URL directly.
Expand All @@ -89,7 +89,7 @@ workflows:
relative:
# You can run this workflow with:
# bitrise-cli run relative
# bitrise run relative
#
# You can specify local path for a step as well.
# The path can be any kind of path (even absolute path)
Expand All @@ -115,7 +115,7 @@ workflows:
local:
# You can run this workflow with:
# bitrise-cli run local
# bitrise run local
#
# This is the same as the 'relative' workflow example
# just demonstrating that you can use all the common
Expand Down
2 changes: 1 addition & 1 deletion _scripts/go_install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd "${STEPMAN_REPO_DIR_PATH}"
godep restore
go install

# godep restore for bitrise-cli
# godep restore for bitrise
cd "${REPO_ROOT_DIR}"
godep restore

Expand Down
6 changes: 3 additions & 3 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ default_step_lib_source: "https://bitbucket.org/bitrise-team/bitrise-new-steps-s

app:
envs:
- BITRISE_BIN_NAME: bitrise-cli
- BITRISE_BIN_NAME: bitrise
opts:
is_expand: false
- GITHUB_RELEASES_URL: https://github.com/bitrise-io/bitrise-cli/releases
- GITHUB_RELEASES_URL: https://github.com/bitrise-io/bitrise/releases
opts:
is_expand: false

Expand Down Expand Up @@ -53,7 +53,7 @@ workflows:
set -e
bash ./_scripts/go_install_tools.sh
- script@0.9.0:
title: Running go install on bitrise-cli
title: Running go install on bitrise
inputs:
- content: |
#!/bin/bash
Expand Down
2 changes: 1 addition & 1 deletion bitrise/template_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"text/template"

"github.com/bitrise-io/bitrise-cli/models/models_1_0_0"
"github.com/bitrise-io/bitrise/models/models_1_0_0"
"github.com/bitrise-io/goinp/goinp"
)

Expand Down
2 changes: 1 addition & 1 deletion bitrise/template_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/bitrise-io/bitrise-cli/models/models_1_0_0"
"github.com/bitrise-io/bitrise/models/models_1_0_0"
)

func TestEvaluateStepTemplateToBool(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bitrise/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"gopkg.in/yaml.v2"

log "github.com/Sirupsen/logrus"
models "github.com/bitrise-io/bitrise-cli/models/models_1_0_0"
models "github.com/bitrise-io/bitrise/models/models_1_0_0"
"github.com/bitrise-io/go-pathutil/pathutil"
stepmanModels "github.com/bitrise-io/stepman/models"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func before(c *cli.Context) error {
return err
}
IsCIMode = true
log.Info("Bitrise-cli runs in CI mode")
log.Info("bitrise runs in CI mode")
}

return nil
Expand Down
10 changes: 5 additions & 5 deletions cli/doInit.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"

log "github.com/Sirupsen/logrus"
"github.com/bitrise-io/bitrise-cli/bitrise"
models "github.com/bitrise-io/bitrise-cli/models/models_1_0_0"
"github.com/bitrise-io/bitrise/bitrise"
models "github.com/bitrise-io/bitrise/models/models_1_0_0"
envmanModels "github.com/bitrise-io/envman/models"
"github.com/bitrise-io/go-pathutil/pathutil"
"github.com/bitrise-io/goinp/goinp"
Expand Down Expand Up @@ -118,7 +118,7 @@ echo "Welcome to Bitrise!"`
fmt.Println()
fmt.Println("We initialized a " + DefaultBitriseConfigFileName + " config file for you.")
fmt.Println("If you're in this folder you can use this config file")
fmt.Println(" with bitrise-cli automatically, you don't have to")
fmt.Println(" with bitrise automatically, you don't have to")
fmt.Println(" specify it's path.")
fmt.Println()
}
Expand All @@ -143,14 +143,14 @@ echo "Welcome to Bitrise!"`
fmt.Println()
fmt.Println("Hurray, you're good to go!")
fmt.Println("You can simply run:")
fmt.Println("-> bitrise-cli run primary")
fmt.Println("-> bitrise run primary")
fmt.Println("to test the sample configuration (which contains")
fmt.Println("an example workflow called 'primary').")
fmt.Println()
fmt.Println("Once you tested this sample setup you can")
fmt.Println(" open the " + DefaultBitriseConfigFileName + " config file,")
fmt.Println(" modify it and then run a workflow with:")
fmt.Println("-> bitrise-cli run YOUR-WORKFLOW-NAME")
fmt.Println("-> bitrise run YOUR-WORKFLOW-NAME")
}

func saveSecretsToFile(pth, secretsStr string) (bool, error) {
Expand Down
10 changes: 5 additions & 5 deletions cli/doRun.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

log "github.com/Sirupsen/logrus"
"github.com/bitrise-io/bitrise-cli/bitrise"
"github.com/bitrise-io/bitrise-cli/colorstring"
"github.com/bitrise-io/bitrise-cli/dependencies"
models "github.com/bitrise-io/bitrise-cli/models/models_1_0_0"
"github.com/bitrise-io/bitrise/bitrise"
"github.com/bitrise-io/bitrise/colorstring"
"github.com/bitrise-io/bitrise/dependencies"
models "github.com/bitrise-io/bitrise/models/models_1_0_0"
envmanModels "github.com/bitrise-io/envman/models"
"github.com/bitrise-io/go-pathutil/pathutil"
stepmanModels "github.com/bitrise-io/stepman/models"
Expand Down Expand Up @@ -620,7 +620,7 @@ func doRun(c *cli.Context) {
}
fmt.Println()
log.Infoln("You can run a selected workflow with:")
log.Infoln("-> bitrise-cli run the-workflow-name")
log.Infoln("-> bitrise run the-workflow-name")
os.Exit(1)
}

Expand Down
6 changes: 3 additions & 3 deletions cli/doSetup.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"runtime"

log "github.com/Sirupsen/logrus"
"github.com/bitrise-io/bitrise-cli/dependencies"
"github.com/bitrise-io/bitrise/dependencies"
"github.com/codegangsta/cli"
)

Expand Down Expand Up @@ -50,9 +50,9 @@ func doSetup(c *cli.Context) {
fmt.Println()
log.Infoln("We're ready to rock!!")
fmt.Println()
log.Infoln("To start using bitrise-cli:")
log.Infoln("To start using bitrise:")
log.Infoln("* cd into your project's directory (if you're not there already)")
log.Infoln("* call: bitrise-cli init")
log.Infoln("* call: bitrise init")
log.Infoln("* follow the guide")
fmt.Println()
log.Infoln("That's all :)")
Expand Down
4 changes: 2 additions & 2 deletions dependencies/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"

log "github.com/Sirupsen/logrus"
"github.com/bitrise-io/bitrise-cli/bitrise"
"github.com/bitrise-io/bitrise-cli/colorstring"
"github.com/bitrise-io/bitrise/bitrise"
"github.com/bitrise-io/bitrise/colorstring"
)

// CheckProgramInstalledPath ...
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app:
build: .
volumes:
- .:/go/src/github.com/bitrise-io/bitrise-cli
- .:/go/src/github.com/bitrise-io/bitrise
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"

log "github.com/Sirupsen/logrus"
"github.com/bitrise-io/bitrise-cli/cli"
"github.com/bitrise-io/bitrise/cli"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion models/models_1_0_0/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

// -------------------
// --- Bitrise-cli models
// --- bitrise models

// BitriseDataModel ...
type BitriseDataModel struct {
Expand Down

0 comments on commit 2df0d40

Please sign in to comment.