nimbu 0.10.5 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48bfa351bcd8da9f22cc3ae2ac186fede987627447bec43cd533697de6671e96
-  data.tar.gz: 8e4633b3b0f8a1983c70ee068265e4ca3b98c68f8d2c716608ff36170a85ff49
+  metadata.gz: 8b83d487f125fd6e62172e87ffd73d35dfe239a3e28d89909628071a8f5146c2
+  data.tar.gz: f0cb95835bc63ede7c7788718865677fa041458492c0792016862775798467c3
 SHA512:
-  metadata.gz: 102857f2d0c6d113f72bf36e9c1bc8c7063694eebf0c852ef20b4fd654a690f74263eb6bc8644f269696adfa4bb0646101195b602ec39f4352537eed3e7feead
-  data.tar.gz: ae1724304345db6c2bd6d5aff0791afd4ec229981f846310fce6684a19eb567e8bd2d9f257e938c05473b12fb7e7c4013fde5587db7cd941f41a819b6342fc43
+  metadata.gz: 6c8b2996b73656dffd0f927d09cfb641ee1628a3c64c76dc1ab7b68e0297d782a94f005a5f2b11bc3ab77e194e519a490b890f3e4e25ab2835a269fbffc43456
+  data.tar.gz: '0197d07948ec81b9ce10b001db9428347c5c95b8a58507a192bf70feb93ffb648324273eff21305af7996cf85c4221e18f4c6cb5bee19039f989cbf94340364c'

data/lib/nimbu/command/themes.rb

@@ -138,6 +138,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "fonts/#{font}", :file => io})
         print " - fonts/#{font}"
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, font) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "fonts/#{font}", :file => io, force: "true"})
+        end  
       end
     end
 
@@ -156,6 +160,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "images/#{image}", :file => io})
         print " - images/#{image}"
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, image) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "images/#{image}", :file => io, force: "true"})
+        end  
       end
     end
 
@@ -174,6 +182,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "stylesheets/#{css}", :file => io})
         print " - stylesheets/#{css}"
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, css) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "stylesheets/#{css}", :file => io, force: "true"})
+        end  
       end
     end
 
@@ -192,6 +204,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "javascripts/#{js}", :file => io})
         print " - javascripts/#{js}"
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, js) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).assets(:theme_id => theme).create({:name => "javascripts/#{js}", :file => io, force: "true"})
+        end  
       end
     end
 
@@ -213,6 +229,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         print " - snippets/#{snippet}"
         nimbu.themes(:subdomain => Nimbu::Auth.site).snippets(:theme_id => theme).create({:name => snippet, :content => IO.read(file).force_encoding('UTF-8')})
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, snippet) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).snippets(:theme_id => theme).create({:name => snippet, :content => IO.read(file).force_encoding('UTF-8'), force: "true"})
+        end  
       end
 
       print "\nLayouts:\n"
@@ -222,6 +242,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         print " - layouts/#{layout}"
         nimbu.themes(:subdomain => Nimbu::Auth.site).layouts(:theme_id => theme).create({:name => layout, :content => IO.read(file).force_encoding('UTF-8')})
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, layout) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).layouts(:theme_id => theme).create({:name => layout, :content => IO.read(file).force_encoding('UTF-8'), force: "true"})
+        end
       end
 
       print "\nTemplates:\n"
@@ -231,6 +255,10 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         print " - templates/#{template}"
         nimbu.themes(:subdomain => Nimbu::Auth.site).templates(:theme_id => theme).create({:name => template, :content => IO.read(file).force_encoding('UTF-8')})
         print " (ok)\n"
+      rescue Nimbu::Error::Conflict => error
+        handle_conflict(error, template) do
+          nimbu.themes(:subdomain => Nimbu::Auth.site).templates(:theme_id => theme).create({:name => template, :content => IO.read(file).force_encoding('UTF-8'), force: "true"})
+        end  
       end
     end
   rescue ::Nimbu::Error::Forbidden
@@ -239,6 +267,21 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
 
   private
 
+  def handle_conflict(error, filename, &block)
+    if error.message =~ /Conflict \((.*)\)/
+      puts " => WARNING!! #{$1}".red
+      if confirm("    Do you want to overwrite these changes? (y/n)")
+        print "     -> Forcing upload of #{filename}".green
+        yield
+        print ": (ok)\n"
+      else
+        puts "     -> Ok, skipping upload of #{filename}".yellow
+      end
+    else
+      puts " could not be updated".red
+    end
+  end
+
   def check_differences(contents, theme, *types)
     types.each do |type|
       if contents[type].any?

data/lib/nimbu/helpers.rb

@@ -35,16 +35,6 @@ module Nimbu
       display "WARNING: #{message}"
     end
 
-    def confirm_billing
-      display
-      display "This action will cause your account to be billed at the end of the month"
-      display "For more information, see https://devcenter.Nimbu.com/articles/usage-and-billing"
-      if confirm
-        Nimbu::Auth.client.confirm_billing
-        true
-      end
-    end
-
     def confirm(message="Are you sure you wish to continue? (y/n)")
       display("#{message} ", false)
       ['y', 'yes'].include?(ask.downcase)

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.10.5"
+  VERSION = "0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: '0.11'
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement