softwear 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d715e0759e33a014c97ab25bdd01db678ab666d3
-  data.tar.gz: 66ad37169e8051c909ca91c326dba79f1fb20bb3
+  metadata.gz: 01de1828d719062f288103e349d925bba0938087
+  data.tar.gz: 87d00d08d8cb2948cbc4227ef9e27f1eff9fe275
 SHA512:
-  metadata.gz: 4100ed66d9ea3b8c838efd51d85a33fe9c9fba334b02145e12003329d8b503c27476b7831cc8e8ba38a60ca40344a9f6a24252701cac8448e55d506c75587fb5
-  data.tar.gz: aa8d8df330bb7564b5a0203758c67024bfa62f65b644633e9f7d9a18d45769c147693c772be87c8af7e3329aeb6482ccf8ac6967075d9aa8dcdce6a852ba0083
+  metadata.gz: 5ca31e319e04e82c2d0126f48f360d3f47e290264be6ce0d86fec2cb5b97dfbfaa002eff73a6940a06840c63313cf372ebaf7adb2cdcdd637f3d01ee34a08609
+  data.tar.gz: ca5e01c2bf1105a108d33843496cef021e1da0b730d82496a9b9a6909b2416226d26f733b0a91944f72993589c276f7c4fe57ac53c53b90b762ab7ec28c5cb1c

data/Rakefile

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/app/controllers/softwear/application_controller.rb

@@ -1,4 +1,5 @@
 module Softwear
   class ApplicationController < ActionController::Base
+    include Softwear::ErrorCatcher
   end
 end

data/app/controllers/softwear/error_reports_controller.rb

@@ -23,7 +23,7 @@ module Softwear
       end
 
       ErrorReportMailer.send_report(user, params).deliver
-      flash[:success] = 'Sent error report. Sorry about that.'
+      flash[:success] = 'Sent error report. Sorry about that and thank you for your submission.'
 
       if user
         redirect_to '/'

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/bin/softwear-deploy

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+if ENV['TRAVIS_BRANCH'].strip == 'master'
+  exec "export RAILS_ENV=development; bundle install && bundle exec cap production deploy"
+else
+  puts "Not on master branch - no deploy."
+end

data/lib/softwear/version.rb

@@ -1,3 +1,3 @@
 module Softwear
-  VERSION = "2.0.0"
+  VERSION = "2.0.3"
 end

data/lib/softwear.rb

@@ -1,6 +1,5 @@
 require 'softwear/engine'
 require 'softwear/version'
-require 'softwear/error_catcher'
 
 require "softwear/library/spec"
 require "softwear/library/api_controller"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Nigel Baillie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,6 +45,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.5
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +115,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
-description: Re-worked softwear-lib gem.
+description: Re-worked from softwear-lib gem. Error reporting and common gems and
+  logic for all softwear apps.
 email:
 - nigel@annarbortees.com
 - stefan@annarbortees.com
@@ -116,6 +131,7 @@ files:
 - app/assets/javascripts/softwear/modals.js.coffee
 - app/assets/stylesheets/softwear/application.css
 - app/controllers/softwear/application_controller.rb
+- app/controllers/softwear/concerns/error_catcher.rb
 - app/controllers/softwear/error_reports_controller.rb
 - app/helpers/softwear/application_helper.rb
 - app/helpers/softwear/emails_helper.rb
@@ -126,6 +142,8 @@ files:
 - app/views/softwear/errors/internal_server_error.html.erb
 - app/views/softwear/errors/internal_server_error.js.erb
 - bin/rails
+- bin/softwear
+- bin/softwear-deploy
 - config/routes.rb
 - lib/softwear.rb
 - lib/softwear/auth/belongs_to_user.rb
@@ -137,7 +155,6 @@ files:
 - lib/softwear/auth/stubbed_model.rb
 - lib/softwear/auth/token_authentication.rb
 - lib/softwear/engine.rb
-- lib/softwear/error_catcher.rb
 - lib/softwear/library/api_controller.rb
 - lib/softwear/library/capistrano.rb
 - lib/softwear/library/controller_authentication.rb
@@ -152,7 +169,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- softwear
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="