disco_app 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7a296f6ce7a9ce25aae89a29d0e7e572cb4d8951204eb228a4082bcdd79c26
-  data.tar.gz: 894c605bfaf8d52a9b318fb5eb2a77d00523a16bb8a9785208843c65e9da0163
+  metadata.gz: 2aea621a853026f74eafff2e73f50d988c2ee307c34d695e3bec09d91fa1a89e
+  data.tar.gz: 3b52502b57d84599268706459a7e87953436bd9ea2058e0419e96053252813fd
 SHA512:
-  metadata.gz: db0e0e1e6466cc93acebaf0b8fd908db03f90a3156df7471bcbbfbf741065e87f3664024f30dd99bd62de365f6097904b41626a1b714a728e65c43b9dcb6e662
-  data.tar.gz: 56f900ff28ac24213f52664603f27fe7d0bc74575a2286ddfcb71948c27790e887f36603a79b863ae8a7395170e03ee04f71a01294436b0c1d7a2b669b36bfb5
+  metadata.gz: 867867d75021ba2020107b0ade11795dff0154da13ac82807702c006e7c8091e99a183ea2ea652469c27324211e6668c819cb6922058e8e5caaa560ce7d9e9ab
+  data.tar.gz: a414302c5d3291c64bc018179bb6db40f23dccb09aa7cd3c0a41f75eb33b76dde0bfbd9e595c1ab50df0635ea189fa907f198ef8f188f9b0c668da24e178b7a0

data/app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb

@@ -6,16 +6,25 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
     # Don't proceed unless we have a name and callback url.
     return unless carrier_service_name and callback_url
 
-    # Don't proceed if the carrier service is already registered.
-    return if current_carrier_service_names.include?(carrier_service_name)
-
-    # Otherwise, register the carrier service.
-    ShopifyAPI::CarrierService.create(
-      name: carrier_service_name,
-      callback_url: callback_url,
-      service_discovery: true,
-      format: 'json'
-    )
+    # Registered the carrier service if it hasn't been registered yet.
+    unless current_carrier_service_names.include?(carrier_service_name)
+      ShopifyAPI::CarrierService.create(
+        name: carrier_service_name,
+        callback_url: callback_url,
+        service_discovery: true,
+        format: :json
+      )
+    end
+
+    # Ensure any existing carrier services (with the correct name) are active
+    # and have a current callback URL.
+    current_carrier_services.each do |carrier_service|
+      if carrier_service.name == carrier_service_name
+        carrier_service.callback_url = callback_url
+        carrier_service.active = true
+        carrier_service.save
+      end
+    end
   end
 
   protected
@@ -30,7 +39,7 @@ module DiscoApp::Concerns::SynchroniseCarrierServiceJob
 
   private
 
-    # Return a list of currently registered callback URLs.
+    # Return a list of currently registered carrier service names.
     def current_carrier_service_names
       current_carrier_services.map(&:name)
     end

data/app/jobs/disco_app/concerns/synchronise_webhooks_job.rb

@@ -22,6 +22,14 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
         webhook.delete
       end
     end
+
+    # Ensure webhook addresses are current.
+    current_webhooks.each do |webhook|
+      unless webhook.address == webhooks_url
+        webhook.address = webhooks_url
+        webhook.save
+      end
+    end
   end
 
   protected

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/generators/disco_app/{rollbarify/rollbarify_generator.rb → monitorify/monitorify_generator.rb}

@@ -1,14 +1,15 @@
 module DiscoApp
   module Generators
-    class RollbarifyGenerator < Rails::Generators::Base
+    class MonitorifyGenerator < Rails::Generators::Base
 
       source_root File.expand_path('../templates', __FILE__)
 
-      # Install the Rollbar and OJ gems.
+      # Install the Rollbar, OJ and New Relic gems.
       def install_gems
         # Add gem to Gemfile
         gem 'rollbar', '~> 2.7.1'
         gem 'oj', '~> 2.14.3'
+        gem 'newrelic_rpm', '~> 3.14.1.311'
 
         # Install gem.
         Bundler.with_clean_env do
@@ -16,9 +17,10 @@ module DiscoApp
         end
       end
 
-      # Copy initializer.
+      # Copy Rollbar initializer and New Relic config file.
       def configure
         copy_file 'initializers/rollbar.rb', 'config/initializers/rollbar.rb'
+        copy_file 'config/newrelic.yml', 'config/newrelic.yml'
       end
 
     end

data/lib/generators/disco_app/monitorify/templates/config/newrelic.yml

@@ -0,0 +1,26 @@
+# This file configures the New Relic Agent.
+#
+# For full documentation of agent configuration options, please refer to
+# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
+
+common: &default_settings
+  license_key: <%= ENV['NEW_RELIC_LICENSE_KEY'] %>
+  app_name: <%= ENV['SHOPIFY_APP_NAME'] || 'Unknown App' %>
+
+  # To disable the agent regardless of other settings, uncomment the following:
+  # agent_enabled: false
+
+  # Logging level for log/newrelic_agent.log
+  log_level: info
+
+development:
+  <<: *default_settings
+  app_name: <%= ENV['SHOPIFY_APP_NAME'] || 'Unknown App' %> (Development)
+  developer_mode: true
+
+test:
+  <<: *default_settings
+  monitor_mode: false
+
+production:
+  <<: *default_settings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Gavin Ballard
@@ -341,9 +341,10 @@ files:
 - lib/generators/disco_app/USAGE
 - lib/generators/disco_app/disco_app_generator.rb
 - lib/generators/disco_app/mailify/mailify_generator.rb
+- lib/generators/disco_app/monitorify/monitorify_generator.rb
+- lib/generators/disco_app/monitorify/templates/config/newrelic.yml
+- lib/generators/disco_app/monitorify/templates/initializers/rollbar.rb
 - lib/generators/disco_app/reactify/reactify_generator.rb
-- lib/generators/disco_app/rollbarify/rollbarify_generator.rb
-- lib/generators/disco_app/rollbarify/templates/initializers/rollbar.rb
 - lib/generators/disco_app/templates/assets/javascripts/application.js
 - lib/generators/disco_app/templates/assets/stylesheets/application.scss
 - lib/generators/disco_app/templates/config/puma.rb