calabash-android 0.5.16.pre1 → 0.6.0.pre4

data/lib/calabash-android/usage_tracker.rb

@@ -0,0 +1,192 @@
+module Calabash
+  module Android
+    class UsageTracker
+
+      require "httpclient"
+
+      # @!visibility private
+      @@track_usage = true
+
+      # @!visibility private
+      def self.enable_usage_tracking
+        @@track_usage = true
+      end
+
+      # @!visibility private
+      def self.disable_usage_tracking
+        @@track_usage = false
+      end
+
+      # @!visibility private
+      def post_usage
+        if Calabash::Android::UsageTracker.track_usage? &&
+            info_we_are_allowed_to_track != "none"
+          begin
+            HTTPClient.post(ROUTE, info)
+          rescue => e
+            message = %Q{ERROR: Could not post usage tracking information:#{$-0}#{e}}
+            Calabash::Android::Logging.log_to_file(message)
+          end
+        end
+      end
+
+      # @!visibility private
+      def post_usage_async
+        t = Thread.new do
+          post_usage
+        end
+
+        m = Thread.current
+
+        Thread.new do
+          loop do
+            unless t.alive?
+              break
+            end
+
+            unless m.alive?
+              t.kill
+              break
+            end
+          end
+        end
+        nil
+      end
+
+      private
+
+      # @!visibility private
+      def preferences
+        Calabash::Android::Preferences.new
+      end
+
+      # @!visibility private
+      def user_id
+        preferences.user_id
+      end
+
+      # @!visibility private
+      def info_we_are_allowed_to_track
+        preferences.usage_tracking
+      end
+
+      # @!visibility private
+      def self.track_usage?
+        @@track_usage && !self.xtc?
+      end
+
+      # @!visibility private
+      def self.xtc?
+        ENV["XAMARIN_TEST_CLOUD"] == "1"
+      end
+
+      # @!visibility private
+      DATA_VERSION = "1.1"
+
+      # @!visibility private
+      WINDOWS = "Windows"
+
+      # @!visibility private
+      OSX = "Darwin"
+
+      # @!visibility private
+      CALABASH_IOS = "iOS"
+
+      # @!visibility private
+      CALABASH_ANDROID = "Android"
+
+      # @!visibility private
+      ROUTE = "http://calabash-ci.macminicolo.net:56789/logEvent"
+
+      # @!visibility private
+      def host_os
+        @host_os ||= lambda do
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+            WINDOWS
+          else
+            `uname -s`.chomp
+          end
+        end.call
+      end
+
+      # @!visibility private
+      def host_os_version
+        @host_os_version ||= lambda do
+          if host_os == WINDOWS
+            `ver`.chomp
+          elsif host_os == OSX
+            `sw_vers -productVersion`.chomp
+          else
+            `uname -r`.chomp
+          end
+        end.call
+      end
+
+      # @!visibility private
+      def irb?
+        $0 == "irb"
+      end
+
+      # @!visibility private
+      def ruby_version
+        @ruby_version ||= `#{RbConfig.ruby} -v`.chomp
+      end
+
+      # @!visibility private
+      def used_bundle_exec?
+        Object.const_defined?(:Bundler)
+      end
+
+      # @!visibility private
+      def used_cucumber?
+        Object.const_defined?(:Cucumber)
+      end
+
+      # @!visibility private
+      #
+      # Collect a hash of usage info.
+      def info
+
+        allowed = info_we_are_allowed_to_track
+
+        if allowed == "none"
+          raise RuntimeError,
+            "This method should not be called if the user does not want to be tracked."
+        end
+
+        # Events only
+        hash = {
+          :event_name => "session",
+          :data_version => DATA_VERSION,
+          :user_id => user_id
+        }
+
+        if allowed == "system_info"
+          hash.merge!(
+            {
+              :platform => CALABASH_ANDROID,
+              :host_os => host_os,
+              :host_os_version => host_os_version,
+              :irb => irb?,
+              :ruby_version => ruby_version,
+              :used_bundle_exec => used_bundle_exec?,
+              :used_cucumber => used_cucumber?,
+
+              :version => Calabash::Android::VERSION,
+
+              :ci => Calabash::Android::Environment.ci?,
+              :jenkins => Calabash::Android::Environment.jenkins?,
+              :travis => Calabash::Android::Environment.travis?,
+              :circle_ci => Calabash::Android::Environment.circle_ci?,
+              :gitlab => Calabash::Android::Environment.gitlab?,
+              :teamcity => Calabash::Android::Environment.teamcity?
+            }
+          )
+        end
+
+        hash
+      end
+    end
+  end
+end
+

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.16.pre1"
+    VERSION = "0.6.0.pre4"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -14,7 +14,7 @@ module Calabash
           :post_timeout => 0,
           :timeout_message => 'Timed out waiting...',
           :screenshot_on_error => true
-      }.freeze
+      }
 
       def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat

data/lib/calabash-android.rb

@@ -1,4 +1,9 @@
 require 'calabash-android/defaults'
+require 'calabash-android/environment'
+require 'calabash-android/dot_dir'
+require 'calabash-android/logging'
+require 'calabash-android/store/preferences'
+require 'calabash-android/usage_tracker'
 require 'calabash-android/operations'
 require 'calabash-android/version'
-require 'calabash-android/abase'
+require 'calabash-android/abase'

metadata

@@ -1,181 +1,293 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.16.pre1
+  version: 0.6.0.pre4
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stub_env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
@@ -184,53 +296,32 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".calabash_settings"
-- ".yardopts"
-- CHANGES.txt
-- ENVIRONMENT_VARIABLES.md
-- Gemfile
-- LICENSE
-- README_YARDOC.md
-- Rakefile
-- bin/calabash-android
+- irbrc
 - bin/calabash-android-build.rb
 - bin/calabash-android-console.rb
 - bin/calabash-android-generate.rb
 - bin/calabash-android-helpers.rb
 - bin/calabash-android-run.rb
 - bin/calabash-android-setup.rb
-- calabash-android.gemspec
-- epl-v10.html
-- features-skeleton/my_first.feature
-- features-skeleton/step_definitions/calabash_steps.rb
-- features-skeleton/support/app_installation_hooks.rb
-- features-skeleton/support/app_life_cycle_hooks.rb
-- features-skeleton/support/env.rb
-- features-skeleton/support/hooks.rb
-- irbrc
-- lib/calabash-android.rb
+- bin/calabash-android
 - lib/calabash-android/abase.rb
 - lib/calabash-android/calabash_steps.rb
-- lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
 - lib/calabash-android/defaults.rb
-- lib/calabash-android/deprecated_actions.map
+- lib/calabash-android/dot_dir.rb
 - lib/calabash-android/drag_helpers.rb
 - lib/calabash-android/env.rb
+- lib/calabash-android/environment.rb
 - lib/calabash-android/environment_helpers.rb
 - lib/calabash-android/gestures.rb
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/java_keystore.rb
-- lib/calabash-android/lib/AXMLPrinter2.jar
-- lib/calabash-android/lib/TestServer.apk
-- lib/calabash-android/lib/manifest_extractor.jar
-- lib/calabash-android/lib/screenshotTaker.jar
+- lib/calabash-android/logging.rb
 - lib/calabash-android/management/adb.rb
 - lib/calabash-android/management/app_installation.rb
 - lib/calabash-android/monkey_helpers.rb
 - lib/calabash-android/operations.rb
-- lib/calabash-android/removed_actions.txt
 - lib/calabash-android/steps/assert_steps.rb
 - lib/calabash-android/steps/check_box_steps.rb
 - lib/calabash-android/steps/context_menu_steps.rb
@@ -246,15 +337,31 @@ files:
 - lib/calabash-android/steps/search_steps.rb
 - lib/calabash-android/steps/spinner_steps.rb
 - lib/calabash-android/steps/time_picker_steps.rb
+- lib/calabash-android/store/preferences.rb
 - lib/calabash-android/text_helpers.rb
 - lib/calabash-android/touch_helpers.rb
+- lib/calabash-android/usage_tracker.rb
 - lib/calabash-android/version.rb
 - lib/calabash-android/wait_helpers.rb
-- test-server/AndroidManifest.xml
-- test-server/build.xml
-- test-server/calabash-js/src/calabash.js
+- lib/calabash-android.rb
+- lib/calabash-android/deprecated_actions.map
+- lib/calabash-android/removed_actions.txt
+- lib/calabash-android/lib/AXMLPrinter2.jar
+- lib/calabash-android/lib/manifest_extractor.jar
+- lib/calabash-android/lib/screenshotTaker.jar
+- features-skeleton/my_first.feature
+- features-skeleton/step_definitions/calabash_steps.rb
+- features-skeleton/support/app_installation_hooks.rb
+- features-skeleton/support/app_life_cycle_hooks.rb
+- features-skeleton/support/env.rb
+- features-skeleton/support/hooks.rb
+- epl-v10.html
+- LICENSE
+- lib/calabash-android/lib/TestServer.apk
+- lib/calabash-android/lib/AndroidManifest.xml
 homepage: http://github.com/calabash
-licenses: []
+licenses:
+- EPL-1.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -262,17 +369,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android

data/.calabash_settings

@@ -1 +0,0 @@
-{"package_name":"","activity_name":"","app_path":"","api_level":"","keystore_location":"","keystore_password":"","keystore_alias":"","keystore_alias_password":""}

data/.yardopts

@@ -1,3 +0,0 @@
---markup=markdown
---no-private
-lib/**/*.rb - LICENSE ENVIRONMENT_VARIABLES.md lib/**/*.md