apprepo 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df104a9102694794cd681b6fcc02166d26e8c1c
-  data.tar.gz: 47bc5b2d1ff9b4cfa45f47d7eeb861a4e37d2f7b
+  metadata.gz: 487be30e91eb76af18b797e54eb5286b7d6236be
+  data.tar.gz: 584a6e042028fbd58c9172ddf9b89db5a6ff38e8
 SHA512:
-  metadata.gz: 69193ee567b1ca06c2aedcc3aeadfe5308aa14fc3c8cb929a3ad3fc484baa1470eb512ea2d22bbe7e6e17636d07e7f6536eb36a133469290e7c2d731bf53dd63
-  data.tar.gz: 8d5d2927717947b29245057c67cd73c1348bea3d099b9ee323bf5230d01af307edeb47415f518678258221125861692908e91b85c5a6dc84a473144295690ba3
+  metadata.gz: ec9e44989a13e06d955ce703636c7e7585fe30ba748e2ed7fc267427e24de4f5c5525d9b88350420e90dc635dc2818611e36176086ab84ecfe306d630220922d
+  data.tar.gz: bceceaf0296e74faa4f65564f0e77aee7284070322768dfd020165dc49ef3b6f540d2bb00656fcba88fc2d9e6ecef5a4577e80b53cf4c4716d58a89935d1fb46

data/README.md

@@ -36,10 +36,10 @@ apprepo
 
 [![Twitter: @igraczech](https://img.shields.io/badge/contact-%40igraczech-green.svg?style=flat)](https://twitter.com/igraczech)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/deliver/LICENSE)
+![Status](https://img.shields.io/badge/_waiting--for_-_fastlane--plugins--manager_-yellow.svg)
 [![Gem](https://img.shields.io/gem/v/apprepo.svg?style=flat)](http://rubygems.org/gems/apprepo)
 [![Build Status](https://img.shields.io/circleci/project/suculent/apprepo.svg?style=flat)](https://circleci.com/gh/suculent/apprepo)
 [![Coverage Status](https://coveralls.io/repos/github/suculent/apprepo/badge.svg?branch=master)](https://coveralls.io/github/suculent/apprepo?branch=master)
-![Fastlane](https://img.shields.io/badge/_status_-_waiting--for--fastlane--plugins--manager_-yellow.svg)
 
 ###### Deliver IPAs, icons & manifest.json to AppRepo (or any other SFTP server) using a single command.
 

data/lib/apprepo.rb

@@ -15,17 +15,18 @@ require_relative 'apprepo/setup'
 require_relative 'apprepo/uploader'
 require_relative 'apprepo/version'
 
+require 'fastlane'
 require 'fastlane_core'
 
 # Root class of the AppRepo SFTP Uploader
 module AppRepo
   class << self
       def initialize
-        UI.message('[AppRepo] Initializing...')
+        UI.message('AppRepo:self Initializing...')
       end
 
       def new
-        UI.message('[AppRepo] New...')
+        UI.message('AppRepo:new')
       end
   end
 

data/lib/apprepo/analyser.rb

@@ -1,5 +1,14 @@
+
+require 'rubygems'
+require 'json'
+require 'net/ssh'
+require 'net/sftp'
+
 require_relative 'uploader'
+
+require 'fastlane'
 require 'fastlane_core'
+require 'fastlane_core/languages'
 
 module AppRepo
   # Should provide metadata for current appcode
@@ -12,14 +21,16 @@ module AppRepo
 
     # Fetches remote app version from metadata
     def fetch_app_version(options)
-      metadata = AppRepo::Uploader.new(options).download_metadata
-      FastlaneCore::UI.user_error!('TODO: Parse version out from metadata')
-      '0.0'
+      metadata = AppRepo::Uploader.new(options).download_manifest_only
+      FastlaneCore::UI.command_output('TODO: Parse version out from metadata')
+      puts JSON.pretty_generate(metadata) unless metadata.nil?
+      FastlaneCore::UI.important('TODO: parse out the bundle-version')
+      metadata['bundle-version']
     end
 
     # only for testing, should be empty
     def run
-      FastlaneCore::UI.message('AppRepo:Analyser.run for test...')
+      FastlaneCore::UI.message('Analyser run, will fetch_app_version...')
       fetch_app_version(options)
     end
   end

data/lib/apprepo/commands_generator.rb

@@ -46,11 +46,10 @@ module AppRepo
           loaded = true if options[:repo_description] || options[:ipa]
 
           unless loaded
-            puts '[AppRepo::CommandsGenerator] configuration file not loaded'
+            UI.message('[AppRepo::CommandsGenerator] configuration file not loaded')
             if UI.confirm('No Repofile found. Do you want to setup apprepo?')
               require 'apprepo/setup'
               AppRepo::Setup.new.run(options)
-              puts '[AppRepo::CommandsGenerator] exiting.'
               return 0
             end
           end
@@ -60,26 +59,14 @@ module AppRepo
       end
 
       command :download_manifest do |c|
-        c.syntax = 'apprepo download manifest'
-        c.description = 'Downloads existing metadata and stores it locally.
-        This overwrites the local files.'
-
+        c.syntax = 'apprepo download_manifest'
+        c.description = 'Download metadata only'
         c.action do |_args, options|
           config = FastlaneCore::Configuration
           available_opts = AppRepo::Options.available_options
           options = config.create(available_opts, options.__hash__)
           options.load_configuration_file('Repofile')
-          AppRepo::Runner.new(options) # to login...
-          cont = FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.'
-          path = options[:manifest_path] || File.join(cont, 'metadata')
-          res = ENV['APPREPO_FORCE_OVERWRITE']
-          msg = 'Do you want to overwrite existing metadata on path '
-          res ||= UI.confirm(msg + '#{File.expand_path(path)}' + '?')
-          return 0 if res.nil?
-          require 'apprepo/setup'
-          # TODO: Fetch version from IPA or else
-          v = options[:app_version].latest_version
-          AppRepo::Setup.new.generate_metadata_files(v, path)
+          AppRepo::Runner.new(options).download_manifest
         end
       end
 
@@ -91,8 +78,6 @@ module AppRepo
           available_opts = AppRepo::Options.available_options
           options = config.create(available_opts, options.__hash__)
           options.load_configuration_file('Repofile')
-          options[:submit_for_review] = true
-          options[:build_number] = 'latest' unless options[:build_number]
           AppRepo::Runner.new(options).run
         end
       end
@@ -110,7 +95,7 @@ module AppRepo
           config = FastlaneCore::Configuration
           available_opts = AppRepo::Options.available_options
           options = config.create(available_opts, options.__hash__)
-          AppRepo::Runner.new(options) # to login...
+          AppRepo::Runner.new(options)
           AppRepo::Setup.new.run(options)
         end
       end

data/lib/apprepo/runner.rb

@@ -8,9 +8,7 @@ module AppRepo
     def initialize(options)
       self.options = options
       AppRepo::DetectValues.new.run!(self.options)
-      # FastlaneCore::PrintTable.print_values(config: options,
-      # hide_keys: [:app], mask_keys: [],
-      # title: "deliver #{AppRepo::VERSION} Summary")
+      FastlaneCore::PrintTable.print_values(config: options, hide_keys: [:repo_password], mask_keys: [:repo_key], title: "apprepo-sftp #{AppRepo::VERSION} Summary")
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -18,7 +16,6 @@ module AppRepo
     def run
       UI.success('AppRepo SFTP Uploader running...')
       verify_version unless options[:app_version].to_s.empty?
-      upload_metadata
       has_binary = options[:ipa]
       if !options[:skip_binary_upload] && !options[:build_number] && has_binary
         upload_binary
@@ -42,9 +39,13 @@ module AppRepo
       # end
     end
 
-    # Upload all metadata, screenshots, pricing information, etc. to AppRepo
-    def upload_metadata
-      #
+    def download_manifest
+      if options[:manifest_path]
+        uploader = AppRepo::Uploader.new(options)
+        result = uploader.download_manifest_only
+        msg = 'Metadata download failed. Check out the error above.'
+        UI.user_error!(msg) unless result
+      end
     end
 
     # Upload the binary to AppRepo
@@ -52,14 +53,14 @@ module AppRepo
       if options[:ipa]
         uploader = AppRepo::Uploader.new(options)
         result = uploader.upload
-        msg = 'Binary upload failed. Check out the error above'
+        msg = 'Binary upload failed. Check out the error above.'
         UI.user_error!(msg) unless result
       end
     end
 
     def notify
       # should be in metadata
-      UI.message('TODO: Missing implementation for AppRepo Push Notifier')
+      UI.command_output('TODO: Missing implementation for AppRepo Push Notifier')
     end
   end
 end

data/lib/apprepo/setup.rb

@@ -31,7 +31,7 @@ module AppRepo
       path = File.join(apprepo_path, 'metadata')
       FileUtils.mkdir_p(path)
       UI.success("TODO: DOWNLOAD MANIFEST'")
-      AppRepo::Uploader.download_metadata(options, path)
+      AppRepo::Uploader.new(options).download_manifest_only
     end
 
     def run(options)

data/lib/apprepo/uploader.rb

@@ -4,8 +4,6 @@ require 'rubygems'
 require 'json'
 require 'net/ssh'
 require 'net/sftp'
-
-require 'fastlane'
 require 'fastlane_core'
 require 'fastlane_core/languages'
 
@@ -56,7 +54,20 @@ module AppRepo
     # rubocop:disable Metrics/MethodLength
     def upload
       # Login & Upload IPA with metadata using RSA key or username/password
-      rsa_key = load_rsa_key(rsa_keypath)
+      FastlaneCore::UI.message('upload...')
+
+      if host.nil? || user.nil?
+        FastlaneCore::UI.user_error('repo_url, repo_user and repo_pasdword or repo_key must be set on upload')
+        return false
+      end
+
+      if rsa_keypath
+        rsa_key = load_rsa_key(rsa_keypath)
+        if rsa_key.nil?
+          FastlaneCore::UI.user_error('Failed to load RSA key... ' + options[:rsa_keypath])
+        end
+      end
+
       success = false
       if !rsa_key.nil?
         FastlaneCore::UI.message('Logging in with RSA key...')
@@ -65,10 +76,9 @@ module AppRepo
           success = ssh_sftp_upload(ssh, ipa_path, manifest_path)
         end
       else
-        FastlaneCore::UI.message('Logging in...')
+        FastlaneCore::UI.message('Logging in with username/password...')
         Net::SSH.start(host, user, password: password) do |ssh|
-          self.ssh_session = ssh
-          FastlaneCore::UI.message('Logged in, uploading IPA & Manifest...')
+          FastlaneCore::UI.message('Uploading IPA & Manifest...')
           success = ssh_sftp_upload(ssh, ipa_path, manifest_path)
         end
       end
@@ -81,35 +91,37 @@ module AppRepo
 
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
-    def download_metadata
+    def download_manifest_only
+      FastlaneCore::UI.message('download_manifest_only...')
       rsa_key = load_rsa_key(rsa_keypath)
-      if rsa_key?
-        FastlaneCore::UI.message('Logging in with RSA key...')
+      success = true
+      if !rsa_key.nil?
+        FastlaneCore::UI.message('Logging in with RSA key for download...')
         Net::SSH.start(host, user, key_data: rsa_key, keys_only: true) do |ssh|
-          self.ssh_session = ssh
           FastlaneCore::UI.message('Uploading UPA & Manifest...')
-          ssh_sftp_download(ssh, manifest_path)
+          success = ssh_sftp_download(ssh, manifest_path)
         end
       else
-        FastlaneCore::UI.message('Logging in...')
+        FastlaneCore::UI.message('Logging in for download...')
         Net::SSH.start(host, user, password: password) do |ssh|
-          self.ssh_session = ssh
-          FastlaneCore::UI.message('Logged in, uploading UPA & Manifest...')
-          ssh_sftp_download(ssh, manifest_path)
+          FastlaneCore::UI.message('Uploading UPA & Manifest...')
+          success = ssh_sftp_download(ssh, manifest_path)
         end
       end
+      success
     end
 
     private
 
-    def ssh_sftp_download(ssh, local_ipa_path, _manifest_path)
+    def ssh_sftp_download(ssh, _manifest_path)
       ssh.sftp.connect do |sftp|
-        break unless check_ipa(local_ipa_path)
-        FastlaneCore::UI.message('[Downloading] Will start...')
+        FastlaneCore::UI.message('Fetching remote manifest...')
         manifest = download_manifest(sftp)
         puts '********************************************************'
         puts JSON.pretty_generate(manifest)
         puts '********************************************************'
+        FastlaneCore::UI.success('Successfully fetched manifest')
+        FastlaneCore::UI.command_output('TODO: Processing manifest not implemented.')
       end
     end
 
@@ -212,7 +224,7 @@ module AppRepo
     # @param [String] local_ipa_path
     # @param [String] remote_ipa_path
     def upload_ipa(sftp, local_ipa_path, remote_ipa_path)
-      msg = '[Uploading IPA] ' + local_ipa_path + ' to ' + remote_ipa_path
+      msg = "[Uploading IPA] #{local_ipa_path} to #{remote_ipa_path}"
       FastlaneCore::UI.message(msg)
       result = sftp.upload!(local_ipa_path, remote_ipa_path) do |event, _uploader, *_args|
         case event
@@ -224,7 +236,7 @@ module AppRepo
         when :close then
           puts "\n"
         when :finish then
-          FastlaneCore::UI.success('Upload successful!')
+          FastlaneCore::UI.success('IPA upload successful')
         end
       end
     end
@@ -240,7 +252,7 @@ module AppRepo
       result = sftp.upload!(local_path, remote_path) do |event, _uploader, *_args|
         case event
         when :finish then
-          FastlaneCore::UI.success('Upload successful!')
+          FastlaneCore::UI.success('Manifest upload successful')
         end
       end
     end
@@ -265,7 +277,7 @@ module AppRepo
       sftp.mkdir remote_path
     rescue Net::SFTP::StatusException => e
       raise if e.code != 11
-      msg = 'Remote dir ' + remote_path + ' exists.'
+      msg = "Remote dir #{remote_path} exists."
       FastlaneCore::UI.message(msg)
     end
 

data/lib/apprepo/version.rb

@@ -1,5 +1,6 @@
 module AppRepo
-  VERSION = '0.0.8'.freeze
-  DESCRIPTION = 'Upload icon, manifest.json and your app to the T-Mobile Enterprise AppRepo and notify users on updaet using a single command'.freeze
-  SUMMARY = 'Upload icon, manifest and your app to SFTP'.freeze
+  VERSION = "0.0.9".freeze
+  DESCRIPTION = "Upload icon, manifest.json and your app to SFTP server
+   and notify users on updaet using a single command".freeze
+  SUMMARY = "Upload icon, manifest and your app to SFTP".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apprepo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Felix Krause
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fastlane
-  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: fastlane_core
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -248,21 +234,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coverband
+  name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.89'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Upload icon, manifest.json and your app to the T-Mobile Enterprise AppRepo
-  and notify users on updaet using a single command
+        version: '1.89'
+description: |-
+  Upload icon, manifest.json and your app to SFTP server
+     and notify users on updaet using a single command
 email:
 - suculent@me.com
 executables: []
@@ -305,7 +292,7 @@ rubyforge_project:
 rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
-summary: Upload icon, manifest.json and your app to the T-Mobile Enterprise AppRepo
-  and notify users on updaet using a single command
+summary: Upload icon, manifest.json and your app to SFTP server and notify users on
+  updaet using a single command
 test_files: []
 has_rdoc: