spaceship 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c6e8217bad88bfdb0c32ab0e02fd732a95ca36
-  data.tar.gz: 606504429db1051598fd6e7b0bcfeab99c477ab2
+  metadata.gz: 9fafd78ad44e1ebeaf7fe1ee2342bfddb3d6155b
+  data.tar.gz: a33cf9b21faab673c3d30f3b41d768d9f7731ab6
 SHA512:
-  metadata.gz: d3f690107bdde045e9db60a376260adfe6b78e11a06483ca08022971e3aa523d1cb7f1399683f4cd6f60164bce86a8c3edf95ef7e391709c96c9df6d8e84769a
-  data.tar.gz: b59835d27eeb8024631863ac30891bbf60a451e4a419573ffb74224249cb8cb22ac373d878b71e7f3cc39170326b7a5da41fb1c99d19a7752b5158b10fd7c056
+  metadata.gz: 0aa86fd5d437df47047a977313093b315c9e297b758e1f6a8d729735c5eee9e4d11c6a3cb77695f4804c60ba485b1d72d0459006e429ece534be8a39578da998
+  data.tar.gz: 7bf6d93ef0e595048b141bb8f6351c66b4e104d15f450a9617d35c8d315a2d85b7ae90ddc46d7ffe4cc0b3d891e8e747fff9d03ea99bb37a62de79fe72b9e54b

data/lib/spaceship/base.rb

@@ -52,13 +52,12 @@ module Spaceship
         module_name = method_sym.to_s
         module_name.sub!(/^[a-z\d]/) { $&.upcase }
         module_name.gsub!(/(?:_|(\/))([a-z\d])/) { $2.upcase }
-        const_name = "#{self.name}::#{module_name}"
-        # if const_defined?(const_name)
-          klass = const_get(const_name)
+        if const_defined?(module_name)
+          klass = const_get(module_name)
           klass.set_client(@client)
-        # else
-        #   super
-        # end
+        else
+          super
+        end
       end
     end
 

data/lib/spaceship/client.rb

@@ -1,4 +1,5 @@
 require 'faraday' # HTTP Client
+require 'logger'
 require 'faraday_middleware'
 require 'spaceship/ui'
 require 'spaceship/helper/plist_middleware'
@@ -18,6 +19,10 @@ module Spaceship
     attr_reader :client
     attr_accessor :cookie
 
+    # The logger in which all requests are logged
+    # /tmp/spaceship.log by default
+    attr_accessor :logger
+
     class InvalidUserCredentialsError < StandardError; end
     class UnexpectedResponse < StandardError; end
 
@@ -65,6 +70,24 @@ module Spaceship
       end
     end
 
+    # The logger in which all requests are logged
+    # /tmp/spaceship.log by default
+    def logger
+      unless @logger
+        if $verbose || ENV["VERBOSE"]
+          @logger = Logger.new(STDOUT)
+        else
+          # Log to file by default
+          @logger = Logger.new("/tmp/spaceship.log")
+        end
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          string = "[#{datetime.strftime('%H:%M:%S')}]: #{msg}\n"
+        end
+      end
+
+      @logger
+    end
+
     # Automatic paging
 
     def page_size
@@ -350,13 +373,33 @@ module Spaceship
         end
         headers.merge!({'User-Agent' => 'spaceship'})
 
+        # Before encoding the parameters, log them
+        log_request(method, url_or_path, params)
+
         # form-encode the params only if there are params, and the block is not supplied.
         # this is so that certain requests can be made using the block for more control
         if method == :post && params && !block_given?
           params, headers = encode_params(params, headers)
         end
 
-        send_request(method, url_or_path, params, headers, &block)
+        response = send_request(method, url_or_path, params, headers, &block)
+
+        log_response(method, url_or_path, response)
+
+        return response
+      end
+
+      def log_request(method, url, params)
+        params_to_log = Hash(params).dup # to also work with nil
+        params_to_log.delete(:accountPassword)
+        params_to_log = params_to_log.collect do |key, value|
+          "{#{key}: #{value}}"
+        end
+        logger.info("#{method.upcase}: #{url} #{params_to_log.join(', ')}")
+      end
+
+      def log_response(method, url, response)
+        logger.debug("#{method.upcase}: #{url}: #{response.body}")
       end
 
       # Actually sends the request to the remote server

data/lib/spaceship/ui/select_team.rb

@@ -42,8 +42,9 @@ module Spaceship
         if team_id.length > 0
           # User provided a value, let's see if it's valid
           teams.each_with_index do |team, i|
-            return team_id if (team['teamId'].strip == team_id)
-            return team_id if (team['currentTeamMember']['teamMemberId'].to_s.strip == team_id)
+            # There are 2 different values - one from the login page one from the Dev Team Page
+            return team['teamId'] if (team['teamId'].strip == team_id)
+            return team['teamId'] if (team['currentTeamMember']['teamMemberId'].to_s.strip == team_id)
           end
           puts "Couldn't find team with ID '#{team_id}'"
         end

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager