Skip to content

Commit

Permalink
Commit before deploy a new version
Browse files Browse the repository at this point in the history
  • Loading branch information
overclokk committed Feb 5, 2019
1 parent 5728b82 commit 6671591
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 53 deletions.
77 changes: 43 additions & 34 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,37 @@ var bootstrap_js_path = bootstrap_path + 'javascripts/bootstrap/';
var bootstrap_fonts_path = bootstrap_path + 'fonts/bootstrap/';

var italystrap_theme = [
'**',
'!codecept',
'**', // All

/**
* Directories
*/
'!.git/**',
'!.gitattributes',
'!.gitignore',
'!.sass-cache/**',
'!node_modules/**',
'!backups/**',
'!bower/**',
'!tests/**',
'!**/test*/**',
'!future-inclusions/**',
'!sass/**',
'!css/src/**',
'!js/src/**',

/**
* Files
*/
'!codecept',
'!.gitattributes',
'!.gitignore',
'!snippets.md',
'!bower.json',
'!Gruntfile.js',
'!package.json',
'!*.bat',
'!*.lock',
'!*.yml',
'!*.zip',
'!**/*.map',
'!**/tests/**',
];

module.exports = function(grunt) {
Expand Down Expand Up @@ -163,20 +172,20 @@ module.exports = function(grunt) {
*
* @type {Object}
*/
less: { // https://github.com/gruntjs/grunt-contrib-less
development: {
options: {
compress: true,
yuicompress: true,
optimization: 2
},
files: {
'css/bootstrap.min.css': [
'css/src/less/bootstrap.less'
],
}
}
},
// less: { // https://github.com/gruntjs/grunt-contrib-less
// development: {
// options: {
// compress: true,
// yuicompress: true,
// optimization: 2
// },
// files: {
// 'css/bootstrap.min.css': [
// 'css/src/less/bootstrap.less'
// ],
// }
// }
// },

csslint: { // http://astainforth.com/blogs/grunt-part-2
files: ['css/src/*.css', '!css/bootstrap.min.css',],
Expand Down Expand Up @@ -261,7 +270,7 @@ module.exports = function(grunt) {
},
first:{
options: {
message: 'Commit before deploy of new version'
message: 'Commit before deploy a new version'
},
files: {
src: [
Expand All @@ -285,14 +294,14 @@ module.exports = function(grunt) {
options: {
questions: [
{
config: 'github-release.options.auth.user', // set the user to whatever is typed for this question
type: 'input',
message: 'GitHub username:'
config: 'github-release.options.auth.user', // set the user to whatever is typed for this question
type: 'input',
message: 'GitHub username:'
},
{
config: 'github-release.options.auth.password', // set the password to whatever is typed for this question
type: 'password',
message: 'GitHub password:'
config: 'github-release.options.auth.password', // set the password to whatever is typed for this question
type: 'password',
message: 'GitHub password:'
}
]
}
Expand All @@ -307,7 +316,7 @@ module.exports = function(grunt) {
files: [
{
src: italystrap_theme, // What should be included in the zip
dest: 'italystrap/', // Where the zipfile should go
dest: '<%= pkg.name %>/', // Where the zipfile should go
filter: 'isFile',
},
]
Expand All @@ -319,8 +328,7 @@ module.exports = function(grunt) {
files: [
{
src: italystrap_theme, // What should be included in the zip
dest: 'italystrap/', // Where the zipfile should go
// dest: 'italystrap/', // Where the zipfile should go
dest: '<%= pkg.name %>/', // Where the zipfile should go
filter: 'isFile',
},
]
Expand All @@ -332,7 +340,7 @@ module.exports = function(grunt) {
files: [
{
src: italystrap_theme, // What should be included in the zip
dest: 'italystrap/', // Where the zipfile should go
dest: '<%= pkg.name %>/', // Where the zipfile should go
filter: 'isFile',
},
]
Expand All @@ -341,10 +349,10 @@ module.exports = function(grunt) {

"github-release": { // https://github.com/dolbyzerr/grunt-github-releaser
options: {
repository: 'overclokk/italystrap', // Path to repository
repository: 'ItalyStrap/<%= pkg.name %>', // Path to repository
release: {
name: '<%= pkg.name %> <%= pkg.version %>',
body: '## New release of <%= pkg.name %> <%= pkg.version %> \nSee the **[changelog](https://github.com/overclokk/italystrap#changelog)**',
body: '## New release of <%= pkg.name %> <%= pkg.version %> \nSee the **[changelog](https://github.com/ItalyStrap/<%= pkg.name %>#changelog)**',
}
},
files: {
Expand Down Expand Up @@ -433,7 +441,8 @@ module.exports = function(grunt) {
// ]
// );

grunt.registerTask('deploy',
grunt.registerTask(
'deploy',
[
'gitcommit:first',
'gitcheckout:devtomaster',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "ItalyStrap",
"name": "italystrap",
"title": "A powerfull theme framework for WordPress",
"description": "",
"author": "Enea Overclokk",
"homepage": "http://www.overclokk.net/italystrap",
"version": "4.0.0-beta.4",
"homepage": "https://italystrap.com",
"version": "4.0.0-beta.5",
"license": "GPL-2.0",
"repository": {
"type": "git",
"url": "https://github.com/overclokk/italystrap.git"
"url": "https://github.com/ItalyStrap/italystrap.git"
},
"devDependencies": {
"autoprefixer-core": "^6.0.1",
Expand Down
41 changes: 35 additions & 6 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: overclokk
Donate link: https://italystrap.com
Tags: breadcrumbs, breadcrumb, seo, performance, schema.org, rich snippet, bootstrap, twitter bootstrap, css, responsive-layout, custom-menu, editor-style, featured-images, flexible-header, post-formats, sticky-post, translation-ready, blog, design, journal, lifestream, tumblelog, bright, clean, colorful, geometric, modern, playful, simple, whimsical, vibrant
Requires at least: 4.6
Tested up to: 4.8
Requires at least: 5.0
Tested up to: 5.2
Stable tag: 4.0.0-beta.4
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -38,17 +38,17 @@ First of all you have to install the core plugin [Advanced Control Manager](http

Clone the git repo of the theme:

`git clone git://github.com/overclokk/italystrap.git`
`git clone git://github.com/ItalyStrap/italystrap.git`

`cd italystrap`

Install composer dependencies:

`composer install --no-dev`

or [download the zip file](https://github.com/overclokk/italystrap/releases/latest), unzip it, place it in your folder themes `/wp-content/themes/` directory and activate it via Admin > Appearance > Themes
or [download the zip file](https://github.com/ItalyStrap/italystrap/releases/latest), unzip it, place it in your folder themes `/wp-content/themes/` directory and activate it via Admin > Appearance > Themes

Then [download the child cheme](https://github.com/overclokk/ItalyStrap-child/archive/master.zip) and use it for your customizations.
Then [download the child cheme](https://github.com/ItalyStrap/ItalyStrap-child/archive/master.zip) and use it for your customizations.

== How to migrate from older version of 4.0.0 ==

Expand All @@ -74,6 +74,35 @@ wp_bootstrap_navwalker is deprecated, use Bootstrap_Navwalker instead

== Changelog ==

= 4.0.0-beta.5 =

Release Date: Feb 5th, 2019

(Dev time 2 years)

**This is a complete rebuild of the theme, it is a breaking changes, always do a backup first**

* Better support for loading the framework with child theme
* Improvements of the botstrapping of the framework
* New API for MCE button
* New API for View in beta
* New filter for title tag `italystrap_entry_title_tag`
* Now breadcrumbs are echoed with hook `do_breadcrumbs`
* Refactoring of some classes
* Fixed some issue
* Added theme support for breadcrumbs
* Added theme support for Gutenberg
* Support for custom 404 page
* Improved assets structure
* Added navbar option for logo on mobile
* Almost compatible with theme check
* Autodefinitions of the theme constants
* CSS for editor is now loaded with the init class
* Added style for gutenberg editor
* Example for Injector
* Example in full-width.php for changing thumbnail size
* Maybe use the EDD to update the theme

= 4.0.0-beta.4 =

Release Date: July 1st, 2017
Expand Down Expand Up @@ -104,7 +133,7 @@ Release Date: April 18th, 2017
* Deprecated class `ItalyStrapBreadcrumbs()`. The breadcrumbs functionality is moved to the plugin.
* Added [AnonymizeIP](https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#anonymizeIp) for cookie law
* Fixed regex in italystrap_embed_wrap cleanup.php
* [Fixed Warning: Illegal string offset](https://github.com/overclokk/ItalyStrap/commit/4c2e4f9afc48e123dbebfa85509774d155b6adf8)
* [Fixed Warning: Illegal string offset](https://github.com/ItalyStrap/ItalyStrap/commit/4c2e4f9afc48e123dbebfa85509774d155b6adf8)
* Fixed do_action hook name in comments.php
* Added new class for sidebars and made dynamic the footer's sidebars
* Deprecated breadcrumbs.php and sidebar.php
Expand Down
18 changes: 9 additions & 9 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/**
* Theme Name: ItalyStrap
* Theme URI: http://italystrap.com
* Theme URI: //italystrap.com
* Author: Enea Overclokk
* Author URI: http://www.overclokk.net
* Author URI: //www.overclokk.net
* Description: Theme Framework for WordPress with twitter Bootstrap, HTML5 boilerplate and Schema.org <a href="https://github.com/overclokk/ItalyStrap/graphs/contributors">Contribute on GitHub</a>
* Version: 4.0.0-beta.4
* License: GPLv2 or later
* License URI: http://www.gnu.org/licenses/gpl-2.0.html
* Tags: right-sidebar, featured-images, full-width-template
* License URI: //www.gnu.org/licenses/gpl-2.0.html
* Tags: right-sidebar, featured-images, full-width-template, two-columns, three-columns, one-column, right-sidebar, left-sidebar, footer-widgets, blog, flexible-header, full-width-template, custom-header, custom-background, custom-menu, custom-colors, sticky-post, threaded-comments, translation-ready, featured-images, theme-options
* Text Domain: italystrap
* Requires at least: 4.6
* Tested up to: 4.8
* GitHub Theme URI: https://github.com/overclokk/italystrap
* GitHub Branch: master
* Requires at least: 5.0
* Tested up to: 5.1
* GitHub Theme URI: https://github.com/ItalyStrap/italystrap
* GitHub Branch: master
*/

/**
Expand All @@ -23,7 +23,7 @@
* custom.css [loaded only in the other pages]
* @see script.php [for loading all script]
*
* For customize your theme use this child: https://github.com/overclokk/ItalyStrap-child
* For customizing your theme use this child: https://github.com/overclokk/ItalyStrap-child
*/

.sticky {}
Expand Down

0 comments on commit 6671591

Please sign in to comment.