softwear-lib 0.0.26 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f990d6bc0df62080cf6cfe3c65e6416f8e7bfd5
-  data.tar.gz: e6fac323606f46d761b29ea4dc8ae452cde9dab0
+  metadata.gz: 9ed6aaa0804888c1913081c44213c0c47f189a30
+  data.tar.gz: cad06c7337e91d23f198d69607405a1689b4633d
 SHA512:
-  metadata.gz: a145a4c508c9477c74fa6c42b404be4a6aa6806ce384e686d5d8f5164dc43b831d7185aca210c6fd28244660c7883acb30300141fb1a007195bdf1df421531f9
-  data.tar.gz: d85419f93a7d2999982fa452c6969300bd53ab32f91a227a41843d1514850280cf0f12ed34683fcee3c439a86d25ea67eaae05ab48fc5000ee83dd086dea8817
+  metadata.gz: 2160ad95faf7aba3715018c6383c682e2ac8ae85ab5d7aa6d56b857d8988c086870f5fb16ea240c23cd5a2bb80a683f3d78c7824448434071044e3882e32be2e
+  data.tar.gz: 092d3642b6f75d15fa422b4ab80c14c87400087761577f96adb922d515de47179394b7d76e7b823422bf8096f91938ab78cd787cca31e8d54ebce51bc3249d0f

data/bin/softwear

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+require 'softwear/lib'
+
+if ARGV.length > 0 && ARGV[0] == 'update'
+  old_gemfile = File.open('Gemfile').read.gsub(/\r\n?/, "\n")
+  gemfile = []
+
+  handler = nil
+  append_line = nil
+
+  injected_gems = false
+
+  ignore_line = lambda do |line|
+    if line.include? Softwear::Lib::GEMFILE_CLOSER
+      gemfile << line
+      handler = append_line
+    end
+  end
+
+  append_line = lambda do |line|
+    gemfile << line
+    if line.include? Softwear::Lib::GEMFILE_OPENER
+      puts "Updating common gems"
+      gemfile << Softwear::Lib::COMMON_GEMS
+      injected_gems = true
+      handler = ignore_line
+    end
+  end
+
+  handler = append_line
+  old_gemfile.each_line do |line|
+    handler.call(line)
+  end
+
+  unless injected_gems
+    puts "Adding common gems - check for duplicates!"
+    gemfile << "\n" + Softwear::Lib::GEMFILE_OPENER + "\n"
+    gemfile << Softwear::Lib::COMMON_GEMS
+    gemfile << Softwear::Lib::GEMFILE_CLOSER + "\n"
+  end
+
+  File.open('Gemfile', 'w') do |file|
+    gemfile.each do |line|
+      file.write(line)
+    end
+  end
+  puts "Done!"
+else
+  puts "Run `softwear update` to update your gemfile's common dependencies"
+end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "0.0.26"
+    VERSION = "1.0.0"
   end
 end

data/lib/softwear/lib.rb

@@ -3,62 +3,63 @@ require "softwear/lib/spec"
 
 module Softwear
   module Lib
-    def self.common_gems(gemfile)
-      gemfile.instance_eval do
-        gem 'rails', '~> 4.2.3'
-
-        gem 'softwear-lib'
-        gem 'mysql2'
-        gem 'sass-rails'
-        gem 'uglifier', '>= 1.3.0'
-        gem 'coffee-rails', '~> 4.0.0'
-        gem 'bootstrap-sass', '~> 3.2.0'
-        gem 'activeresource'
-        gem 'jquery-rails'
-        gem 'jquery-ui-rails'
-        gem 'hirb'
-        gem 'momentjs-rails', '~> 2.9.0'
-        gem 'bootstrap3-datetimepicker-rails', '4.7.14'
-        gem 'js-routes'
-        gem 'inherited_resources'
-        gem 'devise'
-        gem 'figaro'
-        gem 'paranoia', '~> 2.0'
-        gem 'paperclip'
-        gem 'kaminari'
-        gem 'whenever'
-        gem 'dumpsync', git: 'git://github.com/AnnArborTees/dumpsync.git'
-        gem 'bootstrap_form'
-        gem 'acts_as_warnable', git: 'git://github.com/AnnArborTees/acts_as_warnable.git'
-
-        group :development do
-          gem 'capistrano', '~> 3.2.0'
-          gem 'capistrano-rails'
-          gem 'capistrano-rvm', github: 'AnnArborTees/rvm'
-          gem 'capistrano-bundler', github: 'AnnArborTees/bundler'
-          gem 'better_errors', '>= 0.3.2'
-          gem 'binding_of_caller'
-        end
+    GEMFILE_OPENER = "# === BEGIN SOFTWEAR LIB GEMS === #"
+    GEMFILE_CLOSER = "# === END SOFTWEAR LIB GEMS === #"
 
-        group :development, :test do
-          gem 'byebug', platforms: :mri
-          gem 'rubinius-debugger', platforms: :rbx
-        end
 
-        group :test do
-          gem "rspec-rails", "~> 3.2.0"
-          gem 'factory_girl_rails', '>= 4.2.0', require: true
-          gem 'capybara', '~> 2.4'
-          gem 'capybara-webkit'
-          gem 'webmock', require: false
-          gem 'rspec-mocks'
-          gem 'rspec-retry'
-          gem 'email_spec'
-          gem 'selenium-webdriver'
-          gem 'shoulda-matchers'
-        end
-      end
-    end
+    COMMON_GEMS = %(
+gem 'rails', '~> 4.2.3'
+
+gem 'mysql2'
+gem 'sass-rails'
+gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails', '~> 4.0.0'
+gem 'bootstrap-sass', '~> 3.2.0'
+gem 'activeresource'
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'hirb'
+gem 'momentjs-rails', '~> 2.9.0'
+gem 'bootstrap3-datetimepicker-rails', '4.7.14'
+gem 'js-routes'
+gem 'inherited_resources'
+gem 'devise'
+gem 'figaro'
+gem 'paranoia', '~> 2.0'
+gem 'paperclip'
+gem 'kaminari'
+gem 'whenever'
+gem 'dumpsync', git: 'git://github.com/AnnArborTees/dumpsync.git'
+gem 'bootstrap_form'
+gem 'acts_as_warnable', git: 'git://github.com/AnnArborTees/acts_as_warnable.git'
+
+group :development do
+  gem 'capistrano', '~> 3.2.0'
+  gem 'capistrano-rails'
+  gem 'capistrano-rvm', github: 'AnnArborTees/rvm'
+  gem 'capistrano-bundler', github: 'AnnArborTees/bundler'
+  gem 'better_errors', '>= 0.3.2'
+  gem 'binding_of_caller'
+end
+
+group :development, :test do
+  gem 'byebug', platforms: :mri
+  gem 'rubinius-debugger', platforms: :rbx
+end
+
+group :test do
+  gem "rspec-rails", "~> 3.2.0"
+  gem 'factory_girl_rails', '>= 4.2.0', require: true
+  gem 'capybara', '~> 2.4'
+  gem 'capybara-webkit'
+  gem 'webmock', require: false
+  gem 'rspec-mocks'
+  gem 'rspec-retry'
+  gem 'email_spec'
+  gem 'selenium-webdriver'
+  gem 'shoulda-matchers'
+end
+)
 
     def self.capistrano(context)
       context.instance_eval do
@@ -73,7 +74,7 @@ module Softwear
             on roles(:app), in: :sequence do
               execute "gem install -i #{gem_home_1} --no-ri --no-rdoc softwear-lib"
               execute "gem install -i #{gem_home_2} --no-ri --no-rdoc softwear-lib"
-              execute "gem install --no-ri --no-rdoc softwear-lib"
+              execute "~/.rvm/bin/rvm #{ruby} do gem install --no-ri --no-rdoc softwear-lib"
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 1.0.0
 platform: ruby
 authors:
 - Nigel Baillie
@@ -69,7 +69,8 @@ dependencies:
 description: 
 email:
 - nigel@annarbortees.com
-executables: []
+executables:
+- softwear
 extensions: []
 extra_rdoc_files: []
 files:
@@ -79,6 +80,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/softwear
 - lib/softwear/lib.rb
 - lib/softwear/lib/spec.rb
 - lib/softwear/lib/version.rb