skypager 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff992c45f1e886aa507923707a3e23acf2619d04
-  data.tar.gz: 142506da399c4e7e689c6fe9432cef8ec29cb72d
+  metadata.gz: 7d1a82368d73634a06f3c21b9c03d4e2fba74204
+  data.tar.gz: 45113d0e787bc3e7f04de8e6b7ea25f728bb069a
 SHA512:
-  metadata.gz: 91f55f863cfc28960d5402edfe24392dbd1c434dc13bb249738b1c6cf778087037b6d8634dfdc99fcec9212c8573379d28bce740e1e08f4679c5f2a2a81186fe
-  data.tar.gz: da2386e1bb37c2d9d3f407afa530d1705a59dd90f5ab8476e42f5c5c417efc8b718aabf91a23bba4444064d6e45cf41f4d68c375edc49eb310d7436485acd3ac
+  metadata.gz: e17ddc2b802cedfaeb86f7398076aa556e1a44ead479015e63f2ab1efc52cf08ee970ac1dfe88435fdb06720871cfe7fe9e0cc778e54722678326c8902e250e0
+  data.tar.gz: 52c5c06de0a0a9bb8ca0f1dfd00d08acf048410278712626601e6293a884e3b9fd7f3f731ea7760c3d59605706d23ef1d66aee8d4ad92ed3828f67c84212907c

data/lib/skypager/configuration.rb

@@ -77,37 +77,32 @@ module Skypager
       end
     end
 
-    def current
-      @current ||= begin
-                     home_config.merge(cwd_config)
-                   end
-    end
-
-    def current_config
+    def primary_config
       cwd_config_path.exist? ? cwd_config : home_config
     end
 
     def get(setting)
       setting = setting.to_s.downcase
-      current_config[setting]
+      primary_config[setting]
     end
 
     def set(setting, value, persist = true, options={})
       setting = setting.to_s.downcase
-      cfg = options[:global] ? home_config : current_config
-      cfg[setting] = value
+      primary_config[setting] = value
       save! if persist == true
       value
     end
 
     def unset(setting, persist = true)
-      current_config.delete(setting)
+      primary_config.delete(setting)
       save! if persist == true
     end
 
     def current
-      defaults = DefaultSettings.dup
-      Hashie::Mash.new(defaults.merge(home_config.merge(cwd_config).merge(applied_config)))
+      @current ||= begin
+                    defaults = DefaultSettings.dup
+                    Hashie::Mash.new(defaults.merge(home_config.merge(cwd_config).merge(applied_config)))
+                   end
     end
 
     def apply_config_from_path(path)

data/lib/skypager/core_ext.rb

@@ -0,0 +1,21 @@
+class String
+  def with_leading_slash
+    if match(/^\//)
+      self
+    else
+      "/#{self}"
+    end
+  end
+
+  def has_leading_slash?
+    match(/^\//)
+  end
+
+  def without_leading_slash
+    if has_leading_slash?
+      gsub(/^\//,'')
+    else
+      self
+    end
+  end
+end

data/lib/skypager/sync/folder.rb

@@ -124,10 +124,8 @@ module Skypager
           part = parts.join("/")
           root.join(part)
         else
-          parts = remote.to_s.split("/")
-          parts.shift
-          part = parts.join("/")
-          local_path.join(part)
+          sanitized = remote.with_leading_slash.gsub(/^#{remote_path.to_s}/, '').without_leading_slash
+          local_path.join sanitized
         end
       end
 

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/skypager.rb

@@ -13,6 +13,7 @@ require 'uri_template'
 
 require 'skypager/version'
 require 'skypager/configuration'
+require 'skypager/core_ext'
 
 module Skypager
   def self.app(environment="build", &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -323,6 +323,7 @@ files:
 - lib/skypager/cli/commands/setup.rb
 - lib/skypager/cli/commands/sync.rb
 - lib/skypager/configuration.rb
+- lib/skypager/core_ext.rb
 - lib/skypager/data.rb
 - lib/skypager/data/excel_spreadsheet.rb
 - lib/skypager/data/google_spreadsheet.rb