v1.0.1

cetinajero · Dec 13, 2019 · fb3d5d2 · fb3d5d2
1 parent 78e6e55
commit fb3d5d2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [1.0.1](https://www.github.com/cetinajero/jekyll-theme-marketing/releases/tag/v1.0.1)
+
+- [78e6e55](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/78e6e55) Merge pull request #234 from cetinajero/dependabot/npm_and_yarn/firebase-7.6.0
+- [ae9753d](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/ae9753d) Add firebase JS v7.6.0 code
+- [089f135](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/089f135) Merge branch 'master' into dependabot/bundler/html-proofer-3.15.0
+- [14d57c2](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/14d57c2) Merge pull request #232 from cetinajero/release/v1.0.0
+- [ee8825d](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/ee8825d) Bump html-proofer from 3.14.1 to 3.15.0
+
 ## [1.0.0](https://www.github.com/cetinajero/jekyll-theme-marketing/releases/tag/v1.0.0)
 
 - [67612a7](https://www.github.com/cetinajero/jekyll-theme-marketing/commit/67612a7) Merge pull request #231 from cetinajero/feature/gem-deploy-task

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-theme-marketing (1.0.0)
+    jekyll-theme-marketing (1.0.1)
       jekyll (~> 3.6)
 
 GEM

diff --git a/jekyll-theme-marketing.gemspec b/jekyll-theme-marketing.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'jekyll-theme-marketing'
-  spec.version       = '1.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ['Edgar Tinajero']
   spec.email         = ['cetinajero@gmail.com']
 

diff --git a/lib/jekyll_theme_marketing/deploy.rb b/lib/jekyll_theme_marketing/deploy.rb
@@ -22,10 +22,10 @@ def gem
 
       Git.checkout_new_branch "release/v#{new_version}"
       create_release_commit old_version, new_version, ARGV[1]
-      Git.push 'origin', "release/v#{new_version}", '--set-upstream'
-      Git.push 'origin', "v#{new_version}" # Push tagged version
+      #Git.push 'origin', "release/v#{new_version}", '--set-upstream'
+      #Git.push 'origin', "v#{new_version}" # Push tagged version
 
-      publish_to_rubygems new_version
+      #publish_to_rubygems new_version
     else puts 'Usage: rake deploy:gem [ major | minor | patch ]'
     end
   end
@@ -35,6 +35,7 @@ def gem
   def create_release_commit(old, new, type)
     update_changelog old, new
     update_npm old, new
+    Git.add
     system "bump #{type} --tag"
   end
 

diff --git a/lib/jekyll_theme_marketing/git.rb b/lib/jekyll_theme_marketing/git.rb
@@ -4,18 +4,22 @@
 module Git
   module_function
 
+  def add(files = '.')
+    system "git add #{files}"
+  end
+
   def checkout_new_branch(name)
     system 'git checkout master'
     system 'git pull origin master'
     system "git checkout #{name}"    # if the branch doesn't exist, create it
     system "git checkout -b #{name}" # if the branch does exist, switch to it
   end
 
-  def push(remote = '', branch = '', options = '')
-    system "git push #{options} #{remote} #{branch}"
-  end
-
   def list_commits(old, new, options = '')
     `git log #{options} #{old}..#{new}`
   end
+
+  def push(remote = '', branch = '', options = '')
+    system "git push #{options} #{remote} #{branch}"
+  end
 end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-marketing",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Jekyll theme :gem: managed with Yarn",
   "main": "index.js",
   "repository": "git@github.com:cetinajero/jekyll-theme-marketing.git",