rusic 1.0.0 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2992ed7dc5c61302612089bd996c7f313eb1e64
-  data.tar.gz: bda858e42776f4935c28db32feca0414c5cc1ba9
+  metadata.gz: 906bf98a81ece30e9e3c56c38dd7cfaa41e949fb
+  data.tar.gz: c24e9a824095e62cba7f26dcd350ec95128d3316
 SHA512:
-  metadata.gz: 4651c6e49a8129285a3e37158d7f755b0a70a03a113115934052e6803ce21c0fb4c729feeb0c986a8ab43351d960439f01d0f831f3578c7c25370eb93eeccfd3
-  data.tar.gz: 2c9cdfabe02b89e2287fa2be93a433387072f323c6ab14d35c3e473aa943672912390e887b58e8a4f8ae5d5a561da6b0adee38a4212654036afc060f1e9581f8
+  metadata.gz: 5f29976443dd6b7680efbb28a60f3c5d40369f10545f4aff603bbd6b99f2feb5fd6f6b4837d7a164787688c4847488bd2172f92fb2dfd8c092bdf9b7552db9f7
+  data.tar.gz: e6ddcbcb09030b21625f94ab77645572e5cd5ec391899ead7251b688a4d798a82e45c23cb3ccc413775207fa27e87ccc41c97d070d68dadda3161efabe158710

data/lib/rusic.rb

@@ -1,12 +1,14 @@
 require 'rusic/version'
 
 require 'rest_client'
+require 'command_line_reporter'
 
 module Rusic
   require 'rusic/cli'
   require 'rusic/deployer'
   require 'rusic/theme_file'
   require 'rusic/generators/theme'
+  require 'rusic/uploaders/base'
   require 'rusic/uploaders/asset'
   require 'rusic/uploaders/editable_asset'
   require 'rusic/uploaders/template'

data/lib/rusic/cli.rb

@@ -24,9 +24,11 @@ module Rusic
       files.flatten!
 
       if options[:watch]
-        FileWatcher.new(files).watch(0.5) do |file|
-          deployer = Rusic::Deployer.new(file)
-          deployer.upload_files(options)
+        FileWatcher.new(%w[layouts/ ideas/ pages/ assets/]).watch(0.5) do |file, event|
+          unless event == :delete
+            deployer = Rusic::Deployer.new(file)
+            deployer.upload_files(options)
+          end
         end
       else
         deployer = Rusic::Deployer.new(files)

data/lib/rusic/deployer.rb

@@ -10,6 +10,14 @@ module Rusic
       files.each do |file|
         file.uploader.upload_file(options)
       end
+    rescue RestClient::Unauthorized
+      puts
+      puts '401 Unauthorized. Ensure your API Key is set correctly.'
+      exit(1)
+    rescue RestClient::ResourceNotFound
+      puts
+      puts '404 Not Found. Ensure you are have permission to access the given theme'
+      exit(1)
     end
   end
 end

data/lib/rusic/theme_file.rb

@@ -24,6 +24,10 @@ module Rusic
       uploader
     end
 
+    def descriptor
+      "#{dirname}/#{filename}"
+    end
+
     def dirname
       pathname.dirname
     end

data/lib/rusic/uploaders/asset.rb

@@ -1,20 +1,8 @@
 module Rusic
   module Uploaders
-    class Asset
-      attr_accessor :file, :api_key, :theme, :api_host
-
-      def initialize(file)
-        @file = file
-      end
-
-      def upload_file(options = {})
-        @api_key = options.fetch('api_key')
-        @api_host = options.fetch('api_host')
-        @theme = options.fetch('theme')
-
+    class Asset < Base
+      def perform
         client["themes/#{theme}/assets/#{file.filename}"].put(params)
-
-        puts "Saved assets/#{file.filename}"
       end
 
       private
@@ -26,15 +14,6 @@ module Rusic
       def image
         File.open(file.pathname.to_s, 'rb')
       end
-
-      def client
-        headers = {
-          'X-API-Key' => api_key,
-          'Accept' => 'application/vnd.rusic.v1+json'
-        }
-
-        @client ||= RestClient::Resource.new("http://#{api_host}", headers: headers)
-      end
     end
   end
 end

data/lib/rusic/uploaders/base.rb

@@ -0,0 +1,43 @@
+module Rusic
+  module Uploaders
+    class Base
+      include CommandLineReporter
+
+      attr_accessor :file, :api_key, :theme, :api_host
+
+      def initialize(file)
+        @file = file
+      end
+
+      def upload_file(options = {})
+        @api_key = options.fetch('api_key')
+        @api_host = options.fetch('api_host')
+        @theme = options.fetch('theme')
+
+        report(message: "Uploading #{file.descriptor}", complete: '', type: 'inline', indent_size: 2) do
+          begin
+            perform
+            print(' [done]'.green)
+          rescue RestClient::UnprocessableEntity
+            print(' [failed]'.red)
+          end
+        end
+      end
+
+      def perform
+        fail NotImplementedError, 'define a #perform method on your uploader'
+      end
+
+      protected
+
+      def client
+        headers = {
+          'X-API-Key' => api_key,
+          'Accept' => 'application/vnd.rusic.v1+json'
+        }
+
+        @client ||= RestClient::Resource.new("http://#{api_host}", headers: headers)
+      end
+    end
+  end
+end

data/lib/rusic/uploaders/editable_asset.rb

@@ -1,27 +1,13 @@
 module Rusic
   module Uploaders
-    class EditableAsset
-      attr_accessor :file, :api_key, :theme, :api_host
-
-      def initialize(file)
-        @file = file
-      end
-
-      def upload_file(options = {})
-        @api_key = options.fetch('api_key')
-        @api_host = options.fetch('api_host')
-        @theme = options.fetch('theme')
-
+    class EditableAsset < Base
+      def perform
         case file.extname
         when '.css'
           client["themes/#{theme}/stylesheets/#{file.filename}"].put(params)
-
         when '.js'
           client["themes/#{theme}/javascripts/#{file.filename}"].put(params)
-
         end
-
-        puts "Saved assets/#{file.filename}"
       end
 
       private
@@ -33,15 +19,6 @@ module Rusic
       def body
         File.read(file.pathname.to_s)
       end
-
-      def client
-        headers = {
-          'X-API-Key' => api_key,
-          'Accept' => 'application/vnd.rusic.v1+json'
-        }
-
-        @client ||= RestClient::Resource.new("http://#{api_host}", headers: headers)
-      end
     end
   end
 end

data/lib/rusic/uploaders/template.rb

@@ -1,20 +1,8 @@
 module Rusic
   module Uploaders
-    class Template
-      attr_accessor :file, :api_key, :theme, :api_host
-
-      def initialize(file)
-        @file = file
-      end
-
-      def upload_file(options = {})
-        @api_key = options.fetch('api_key')
-        @api_host = options.fetch('api_host')
-        @theme = options.fetch('theme')
-
+    class Template < Base
+      def perform
         client["themes/#{theme}/templates/#{file.dirname}/#{file.filename}"].put(params)
-
-        puts "Saved #{file.dirname}/#{file.filename}"
       end
 
       private
@@ -26,15 +14,6 @@ module Rusic
       def body
         File.read(file.pathname.to_s)
       end
-
-      def client
-        headers = {
-          'X-API-Key' => api_key,
-          'Accept' => 'application/vnd.rusic.v1+json'
-        }
-
-        @client ||= RestClient::Resource.new("http://#{api_host}", headers: headers)
-      end
     end
   end
 end

data/lib/rusic/version.rb

@@ -1,3 +1,3 @@
 module Rusic
-  VERSION = "1.0.0"
+  VERSION = "1.1.0.beta1"
 end

data/rusic.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 0.14.6'
   spec.add_runtime_dependency 'rest-client', '~> 1.6'
   spec.add_runtime_dependency 'filewatcher', '~> 0.3'
+  spec.add_runtime_dependency 'command_line_reporter', '~> 3.3'
 
   spec.add_development_dependency 'rake', '~> 0.9.0'
   spec.add_development_dependency 'rspec', '~> 2.6.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rusic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Chris Mytton
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: command_line_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ files:
 - lib/rusic/templates/pages/about.html.liquid
 - lib/rusic/theme_file.rb
 - lib/rusic/uploaders/asset.rb
+- lib/rusic/uploaders/base.rb
 - lib/rusic/uploaders/editable_asset.rb
 - lib/rusic/uploaders/template.rb
 - lib/rusic/version.rb
@@ -150,9 +165,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2