Skip to content

Commit a4bb830

Browse files
Fixed CHANGELOG, added 4.1 and 4.2 entries
1 parent b841e81 commit a4bb830

File tree

6 files changed

+170
-101
lines changed

6 files changed

+170
-101
lines changed

CHANGELOG.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
### Please leave CHANGELOG entries in the appropriate release notes guide. ##
1+
## 4.2.0 (unreleased)
22

3-
https://github.com/spree/spree/tree/master/guides/src/content/release_notes
3+
https://guides.spreecommerce.org/release_notes/4_2_0.html
44

5-
#### 4.1.x (Unreleased)
5+
## 4.1.0 (2020-02-28)
66

7-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/4_1_0.md
7+
https://guides.spreecommerce.org/release_notes/4_1_0.html
88

9-
#### 4.0.x
9+
## 4.0.0 (2019-10-09)
1010

11-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/4_0_0.md
11+
https://guides.spreecommerce.org/release_notes/4_0_0.html
1212

13-
#### 3.7.x
13+
## 3.7.0 (2019-02-04)
1414

15-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_7_0.md
15+
https://guides.spreecommerce.org/release_notes/3_7_0.html
1616

17-
#### 3.6.x
17+
## 3.6.0 (2018-06-12)
1818

19-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_6_0.md
19+
https://guides.spreecommerce.org/release_notes/3_6_0.html
2020

21-
#### 3.5.x
21+
## 3.5.0 (2018-06-12)
2222

23-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_5_0.md
23+
https://guides.spreecommerce.org/release_notes/3_5_0.html
2424

25-
#### 3.4.x
25+
## 3.4.0 (2017-10-12)
2626

27-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_4_0.md
27+
https://guides.spreecommerce.org/release_notes/3_4_0.html
2828

29-
#### 3.3.x
29+
## 3.3.0 (2017-08-22)
3030

31-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_3_0.md
31+
https://guides.spreecommerce.org/release_notes/3_3_0.html
3232

33-
#### 3.2.x
33+
## 3.2.0 (2017-03-17)
3434

35-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_2_0.md
35+
https://guides.spreecommerce.org/release_notes/3_2_0.html
3636

37-
#### 3.1.x
37+
## 3.1.0 (2016-06-15)
3838

39-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_1_0.md
39+
https://guides.spreecommerce.org/release_notes/3_1_0.html
4040

41-
#### 3.0.x
41+
## 3.0.0 (2015-03-10)
4242

43-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/3_0_0.md
43+
https://guides.spreecommerce.org/release_notes/3_0_0.html
4444

45-
#### 2.4.x
45+
## 2.4.0 (2014-11-07)
4646

47-
https://github.com/spree/spree/blob/master/guides/src/content/release_notes/2_4_0.md
47+
https://guides.spreecommerce.org/release_notes/2_4_0.html

README.md

+72-70
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Spree Commerce
2+
13
<a href="https://guides.spreecommerce.org/release_notes/4_1_0.html"><img src="https://spreecommerce.org/wp-content/uploads/2020/02/Spree-4-1-new-ux-relase-notes.png" /></a>
24

35
* Join our Slack at [slack.spreecommerce.org](http://slack.spreecommerce.org/)
@@ -16,37 +18,45 @@
1618
[![Slack Status](http://slack.spreecommerce.org/badge.svg)](http://slack.spreecommerce.org)
1719

1820
**Spree** is a complete open source e-commerce solution built with Ruby on Rails. It
19-
was originally developed by Sean Schofield and is now maintained by [Spark Solutions](http://sparksolutions.co). We're open to [contributions](#contributing) and accepting new [Core Team](https://github.com/spree/spree/wiki/Core-Team) members.
21+
was started by Sean Schofield and is now developed by [Spark Solutions](http://sparksolutions.co). We're open to [contributions](#contributing).
2022

21-
Spree consists of several different gems, each of which are maintained
23+
Spree consists of several different gems (modules), each of which are maintained
2224
in a single repository and documented in a single set of
2325
[online documentation](http://guides.spreecommerce.org/).
2426

2527
* **spree_api** ([REST API v2](https://guides.spreecommerce.org/api/v2) with [JavaScript / TypeScript SDK](https://github.com/spree/spree-storefront-api-v2-js-sdk) and [REST API v1](https://guides.spreecommerce.org/api/))
2628
* **spree_graphql** (GraphQL API - [coming soon](https://github.com/spree/spree/issues/9176))
27-
* **spree_frontend** (modern mobile-first, blazging fast customizable storefront powered by [Turbolinks](https://github.com/turbolinks/turbolinks))
29+
* **spree_frontend** (mobile-first, blazing fast and customizable storefront)
2830
* **spree_backend** (feature rich Admin Panel)
2931
* **spree_cmd** (command-line tools for developers)
3032
* **spree_core** (models, services & mailers, the basic components of Spree)
3133
* **spree_sample** (sample data for demo purposes)
3234

33-
You don't need to install all of the components. Only the **Core** is mandatory.
35+
## Demo
36+
37+
Go to: https://demo.spreecommerce.org/
3438

35-
Demo
36-
----
39+
Or fire your own demo on Heroku:
3740

3841
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/spree/spree/tree/master)
3942

40-
If you want to run the demo on your local machine, you can use our docker image. It will download and run sample Spree application on http://localhost:3000
41-
```shell
42-
docker run --rm -it -p 3000:3000 spreecommerce/spree:3.6.4
43-
```
43+
Admin Panel credentials (Heroku demo):
44+
45+
46+
* password: `spree123`
47+
48+
## Installation
4449

45-
Admin Panel credentials - login: `[email protected]` / password: `spree123`
50+
### Create new Rails app (optional)
4651

52+
If you're starting a new application from scrach run:
4753

48-
Getting Started
49-
----------------------
54+
```bash
55+
rails new my_store
56+
cd my_store
57+
```
58+
59+
You can **add Spree to your existing Rails application** as well.
5060

5161
### Add Spree gems to your `Gemfile`
5262

@@ -66,26 +76,21 @@ gem 'spree_auth_devise', '~> 3.5'
6676
gem 'spree_gateway', '~> 3.4'
6777
```
6878

69-
#### Rails 5.1
79+
To see what rails version are you using run this command:
7080

71-
```ruby
72-
gem 'spree', '~> 3.5.0'
73-
gem 'spree_auth_devise', '~> 3.5'
74-
gem 'spree_gateway', '~> 3.4'
81+
```bash
82+
rails -v
7583
```
7684

77-
#### Rails 5.0
78-
79-
```ruby
80-
gem 'spree', '~> 3.2.7'
81-
gem 'spree_auth_devise', '~> 3.5'
82-
gem 'spree_gateway', '~> 3.4'
83-
```
85+
Older rails versions are also supported: [Rails 5.1](https://guides.spreecommerce.org/release_notes/3_5_0.html), [Rails 5.0](https://guides.spreecommerce.org/release_notes/3_2_0.html), [Rails 4.2](https://guides.spreecommerce.org/release_notes/3_1_0.html)
8486

85-
### Run `bundle install`
87+
### Install gems
8688

89+
```bash
90+
bundle install
91+
```
8792

88-
**Note**: if you run into `Bundler could not find compatible versions for gem "sprockets":` error message, please run
93+
**Note**: if you run into `Bundler could not find compatible versions for gem "sprockets":` error message, please run
8994

9095
```bash
9196
bundle update
@@ -99,24 +104,11 @@ rails g spree:auth:install
99104
rails g spree_gateway:install
100105
```
101106

102-
Installation options
103-
----------------------
104-
105-
Alternatively, if you want to use the bleeding edge version of Spree, add this to your Gemfile:
106-
107-
```ruby
108-
gem 'spree', github: 'spree/spree'
109-
gem 'spree_auth_devise', github: 'spree/spree_auth_devise'
110-
gem 'spree_gateway', github: 'spree/spree_gateway'
111-
```
112-
113-
**Note: The master branch is not guaranteed to ever be in a fully functioning
114-
state. It is unwise to use this branch in a production system you care deeply
115-
about.**
107+
## Installation options
116108

117109
By default, the installation generator (`rails g spree:install`) will run
118-
migrations as well as adding seed and sample data and will copy frontend views
119-
for easy customization (if spree_frontend available). This can be disabled using
110+
migrations as well as adding seed and sample data and will copy storefront data
111+
for easy customization (if `spree_frontend` available). This can be disabled using
120112

121113
```shell
122114
rails g spree:install --migrate=false --sample=false --seed=false --copy_storefront=false
@@ -126,32 +118,37 @@ You can always perform any of these steps later by using these commands.
126118

127119
```shell
128120
bundle exec rake railties:install:migrations
129-
bundle exec rake db:migrate
130-
bundle exec rake db:seed
121+
bundle exec rails db:migrate
122+
bundle exec rails db:seed
131123
bundle exec rake spree_sample:load
124+
bundle exec rails g spree:frontend:copy_storefront
132125
```
133126

134-
Browse Store
135-
----------------------
127+
### Headless installation
136128

137-
http://localhost:3000
129+
To use Spree in [API-only mode](https://guides.spreecommerce.org/api/overview/) you need to replace `spree` with `spree_api` in your project Gemfile. This will skip Storefront and Admin Panel. If you would want to include the Admin Panel please add `spree_backend` to your Gemfile.
138130

139-
Browse Admin Interface
140-
----------------------
131+
## Run rails sever
141132

142-
http://localhost:3000/admin
133+
```bash
134+
rails s
135+
```
143136

144-
If you have `spree_auth_devise` installed, you can generate a new admin user by running `rake spree_auth:admin:create`.
137+
## Browse Storefront
145138

146-
Extensions
147-
----------------------
139+
Go to http://localhost:3000
148140

149-
Spree Extensions provide additional features not present in the Core system.
141+
## Browse Admin Panel
150142

143+
Go to http://localhost:3000/admin
144+
145+
## Extensions
146+
147+
Spree Extensions provide additional features not present in the Core system.
151148

152149
| Extension | Spree 3.2+ support | Description |
153150
| --- | --- | --- |
154-
| [spree_gateway](https://github.com/spree/spree_gateway) | [![Build Status](https://travis-ci.org/spree/spree_gateway.svg?branch=master)](https://travis-ci.org/spree/spree_gateway) | Community supported Spree Payment Method Gateways
151+
| [spree_gateway](https://github.com/spree/spree_gateway) | [![Build Status](https://travis-ci.org/spree/spree_gateway.svg?branch=master)](https://travis-ci.org/spree/spree_gateway) | Payment Gateways (Stripe, Apple Pay, Braintree, Authorize.net and many others)
155152
| [spree_auth_devise](https://github.com/spree/spree_auth_devise) | [![Build Status](https://travis-ci.org/spree/spree_auth_devise.svg?branch=master)](https://travis-ci.org/spree/spree_auth_devise) | Provides authentication services for Spree, using the Devise gem.
156153
| [spree_i18n](https://github.com/spree-contrib/spree_i18n) | [![Build Status](https://travis-ci.org/spree-contrib/spree_i18n.svg?branch=master)](https://travis-ci.org/spree-contrib/spree_i18n) | I18n translation files for Spree Commerce
157154
| [spree-multi-domain](https://github.com/spree-contrib/spree-multi-domain) | [![Build Status](https://travis-ci.org/spree-contrib/spree-multi-domain.svg?branch=master)](https://travis-ci.org/spree-contrib/spree-multi-domain) | Multiple Spree stores on different domains - single unified backed for processing orders
@@ -175,23 +172,27 @@ Spree Extensions provide additional features not present in the Core system.
175172
| [spree_avatax_official](https://github.com/spree-contrib/spree_avatax_official) | [![Build Status](https://travis-ci.org/spree-contrib/spree_avatax_official.svg?branch=master)](https://travis-ci.org/spree-contrib/spree_avatax_official) | Improve your Spree store's sales tax decision automation with Avalara AvaTax
176173
| [spree_analytics_trackers](https://github.com/spree-contrib/spree_analytics_trackers) | [![Build Status](https://travis-ci.org/spree-contrib/spree_analytics_trackers.svg?branch=master)](https://travis-ci.org/spree-contrib/spree_analytics_trackers) | Adds support for Analytics Trackers (Google Analytics & Segment)
177174

178-
Performance
179-
----------------------
175+
## Performance
180176

181177
You may notice that your Spree store runs slowly in development environment. This can be because in development each asset (css and javascript) is loaded separately. You can disable it by adding the following line to `config/environments/development.rb`.
182178

183179
```ruby
184180
config.assets.debug = false
185181
```
186182

183+
Also in development caching is disabled by defualt. To turn on caching run:
184+
185+
```bash
186+
rails dev:cache
187+
```
187188

188-
Developing Spree
189-
----------------------
189+
You will need to restart rails server after this.
190+
191+
## Developing Spree
190192

191193
Spree is meant to be run within the context of Rails application and the source code is essentially a collection of gems. You can easily create a sandbox
192194
application inside of your cloned source directory for testing purposes.
193195

194-
195196
Clone the Git repo
196197

197198
```shell
@@ -226,11 +227,10 @@ We use [CircleCI](https://circleci.com/) to run the tests for Spree.
226227

227228
You can see the build statuses at [https://circleci.com/gh/spree/spree](https://circleci.com/gh/spree/spree).
228229

229-
---
230-
231230
Each gem contains its own series of tests, and for each directory, you need to
232231
do a quick one-time creation of a test application and then you can use it to run
233232
the tests. For example, to run the tests for the core project.
233+
234234
```shell
235235
cd core
236236
BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app
@@ -239,26 +239,31 @@ bundle exec rspec spec
239239

240240
If you would like to run specs against a particular database you may specify the
241241
dummy app's database, which defaults to sqlite3.
242+
242243
```shell
243244
DB=postgres bundle exec rake test_app
244245
```
245246

246247
If you want to run specs for only a single spec file
248+
247249
```shell
248250
bundle exec rspec spec/models/spree/state_spec.rb
249251
```
250252

251253
If you want to run a particular line of spec
254+
252255
```shell
253256
bundle exec rspec spec/models/spree/state_spec.rb:7
254257
```
255258

256259
You can also enable fail fast in order to stop tests at the first failure
260+
257261
```shell
258262
FAIL_FAST=true bundle exec rspec spec/models/state_spec.rb
259263
```
260264

261265
If you want to run the simplecov code coverage report
266+
262267
```shell
263268
COVERAGE=true bundle exec rspec spec
264269
```
@@ -277,13 +282,12 @@ Please follow this
277282
To execute all the tests, you may want to run this command at the
278283
root of the Spree project to generate test applications and run
279284
specs for all the facets:
285+
280286
```shell
281287
bash build.sh
282288
```
283289

284-
285-
Contributing
286-
----------------------
290+
## Contributing
287291

288292
Spree is an open source project and we encourage contributions. Please review the
289293
[contributing guidelines](https://github.com/spree/spree/blob/master/.github/CONTRIBUTING.md)
@@ -303,14 +307,12 @@ Here are some ways **you** can contribute:
303307
* by reviewing [pull requests](https://github.com/spree/spree/pulls)
304308
* by verifying [issues](https://github.com/spree/spree/labels/unverified)
305309

306-
License
307-
----------------------
310+
## License
308311

309312
Spree is released under the [New BSD License](https://github.com/spree/spree/blob/master/license.md).
310313

314+
## About Spark Solutions
311315

312-
About Spark Solutions
313-
----------------------
314316
[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
315317

316318
Spree is maintained by [Spark Solutions Sp. z o.o.][spark].

guides/src/content/developer/tutorials/extensions_tutorial.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ end
4848

4949
Before we continue development of our extension, let's add it to the Spree application we created in the [last tutorial](/developer/getting_started_tutorial.html). This will allow us to see how the extension works with an actual Spree store while we develop it.
5050

51-
Within the `mystore` application directory, add the following line to the bottom of our `Gemfile`:
51+
Within the `my_store` application directory, add the following line to the bottom of our `Gemfile`:
5252

5353
```ruby
5454
gem 'spree_simple_sales', path: '../spree_simple_sales'
5555
```
5656

57-
You may have to adjust the path somewhat depending on where you created the extension. You want this to be the path relative to the location of the `mystore` application.
57+
You may have to adjust the path somewhat depending on where you created the extension. You want this to be the path relative to the location of the `my_store` application.
5858

5959
Once you have added the gem, it's time to bundle:
6060

0 commit comments

Comments
 (0)