conjoin 0.0.58 → 0.0.59

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/conjoin +14 -9
  3. data/lib/conjoin/version.rb +1 -1
  4. metadata +1 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 939388713235dcd96862bd1a522457e651b4ab27
4
- data.tar.gz: 39e8cdfba3f3ca8c7a1375ef602fb5b7d3783ff4
3
+ metadata.gz: e4b36bb6c227408a6cd5af03bd673418a3f4c586
4
+ data.tar.gz: 3093ff7adc1e6d17ffd4498ac67ea424e4e53d7f
5
5
  SHA512:
6
- metadata.gz: c3673a312e5794768cc45c2d9edacbaca2fa171d0d97560fac3a13546dc5c56904cdf525427a38897ed264298fa34525fb0d4c5e077d788574520a871c288af5
7
- data.tar.gz: 17a42a060ba2d98a32539c00f84bf05ed68e203a8429d6ef767b6fc2ce16f218bf8252c5cbaedd017e728adce88c8675529f8fcf9da885603f9153674b6f4704
6
+ metadata.gz: 332deadefe0e3cb1161f32dfd8814907b74c1c72b7a689ae978665e39f2af8652d67e0382399732dfe7f23cd009e6162cfb3d1d2b478a7b19e63c84730e49f42
7
+ data.tar.gz: 26e002235b590ba06d3a58ad0da57159c58409d80fbcfa4faa4afefdead7b94cc0823bd157841621129ea525b5acffb0c8839e01a4214a99dc6a9b2dba14b709
data/bin/conjoin CHANGED
@@ -70,19 +70,23 @@ module Conjoin
70
70
  return puts 'Please commit all changes before deploying.'
71
71
  end
72
72
 
73
- sha = %x[git rev-parse HEAD].gsub(/\n/, '')
74
- previous_sha = File.open('sha').read
73
+ sha = %x[git rev-parse HEAD].gsub(/\n/, '')
74
+ no_changed_assets = true
75
75
 
76
- diff = `git diff --name-only #{previous_sha} #{sha}`
76
+ if File.exist? 'sha'
77
+ previous_sha = File.open('sha').read
77
78
 
78
- no_changed_assets = true
79
+ diff = `git diff --name-only #{previous_sha} #{sha}`
79
80
 
80
- diff.split(/\n/).each do |d|
81
- next if d[/^public\/assets/]
82
- no_changed_assets &= !d[/\.(css|js|styl|scss|less|coffee)$/]
81
+ diff.split(/\n/).each do |d|
82
+ next if d[/^public\/assets/]
83
+ no_changed_assets &= !d[/\.(css|js|styl|scss|less|coffee)$/]
84
+ end
85
+ else
86
+ previous_sha = false
83
87
  end
84
88
 
85
- if !no_changed_assets
89
+ if !previous_sha || !no_changed_assets
86
90
  File.foreach ".#{env}.env" do |line|
87
91
  key, value = line.split "="
88
92
  ENV[key] = value.gsub('\n', '').strip
@@ -93,7 +97,8 @@ module Conjoin
93
97
  require app_path
94
98
  javascript = stylesheet = ''
95
99
 
96
- app = file_content.match(/(^.*)\.initialize!/).to_a.last.constantize
100
+ app = file_content.match(/(^.*)\.initialize!/)
101
+ .to_a.last.constantize
97
102
 
98
103
  FileUtils.rm_rf('public/assets')
99
104
  new_app = app.new
@@ -1,3 +1,3 @@
1
1
  module Conjoin
2
- VERSION = "0.0.58"
2
+ VERSION = "0.0.59"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjoin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.58
4
+ version: 0.0.59
5
5
  platform: ruby
6
6
  authors:
7
7
  - cj
@@ -533,4 +533,3 @@ signing_key:
533
533
  specification_version: 4
534
534
  summary: Adds certain things to Cuba to make it more familiar to rails devs
535
535
  test_files: []
536
- has_rdoc: