xbean 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d8f1096ca9658b373dc9b9031fc9c0824fa78f
-  data.tar.gz: 1ee4822c0cfe159e32ec339387905d275629e232
+  metadata.gz: 26ac19803a7f7675ca9a9b1f4821ff44ffdb28c8
+  data.tar.gz: 927a479f19f1bb8a124c70fe05cc8e5a3ef42c71
 SHA512:
-  metadata.gz: 3f4fd03c2eb9d1c3b81f6d6e5ca7ba48591ca7de16e5ee73c0942db19704f053123a8c381e76f39a9bb60cd94cdb89f9b9e2c425c4de496797f061501231c21f
-  data.tar.gz: 1cf7a15409c6225579128eccbdd7c8ab561cd5d4032b410f6fd3aef7690d9d9815503d3f01b0260397bd74bc225e38cf735b0802a861bf16ffc79ef5261834c9
+  metadata.gz: 66b91aa64613428eb9cc529fa1fdf5110ef3f55928199270ef08a33947a3795268aff596e6f43507f2329805150a0a859cdf19481805e02b5b9c0072b22e4698
+  data.tar.gz: 1f84dfcdc0d81ba0668ff41b5162692f63f874c5ad87a95a7bb5c9d5151513bb83d7065542dae3ebc085e9b3fa4376265c5e159a3869f7e2d4cefa1e10b0901c

data/.gitignore

@@ -0,0 +1,4 @@
+.Tmp
+*.gem
+Beanfile
+.DS_Store

data/bin/xbean

@@ -5,9 +5,6 @@ require 'xbean'
 
 if ARGV.length > 0 
   action = ARGV.first
-  # file = File.join(Dir.pwd, 'aFile')
-  # puts file
- 
   Bean::Runner.new.exec(action)
   
 end

data/lib/bean/config.rb

@@ -13,21 +13,21 @@ module Workspace
     end
 
     def method_missing(m, *args)
-      # puts "config ---- method: #{m.to_s}, args: #{args}"
+      # puts "config ---- method: #{m.to_s}, args: #{@configs}"
       name = m.to_s
       name = m.to_s.delete('=') if m.to_s =~ /=$/
       return unless %w(workspace scheme output_name compile_bitcode method signing_style team_id thinning).include? name
       if m.to_s =~ /=$/
-        add_configuration(m.to_s.delete('='), args.first)
+        add_configuration(name, args.first)
       else
-        @configs[m.to_sym]
+        get_configuration(m.to_s)
       end
     end
 
     # The ExportOptions Plist object.
 
     def export_options_plist
-      get_team_identifier
+      return nil unless get_team_identifier
 
       plist = ExportOptions::Plist.new(@name)
       @configs.each do | key, value |
@@ -37,14 +37,16 @@ module Workspace
           plist.send key.to_sym, value
         # end
       end
-      return plist
+      File.join(Workspace::TMP_DIR, "#{@name.to_s.capitalize}-ExportOptions.plist")
     end
 
     def export_path
-      File.join(Dir.pwd, "#{self.scheme}")
+      path = File.join(Dir.pwd, "#{self.scheme}-Archived")
       if self.output_name 
-        return File.join(Dir.pwd, "#{self.output_name}")
+        path = File.join(Dir.pwd, "#{self.output_name}-Archived")
       end
+      @configs[:exportPath] = path
+      return path
     end
 
     def to_s
@@ -54,13 +56,15 @@ module Workspace
     private
 
     def get_team_identifier
-      mobileprovision = File.join(File.expand_path("#{scheme}.xcarchive", Workspace::TMP_DIR), "Products/Applications/#{scheme}.app/embedded.mobileprovision")
-      return unless File.exist?(mobileprovision)
-      # puts "mobileprovision: #{mobileprovision}"
+      application_path = File.join(File.expand_path("#{scheme}.xcarchive", Workspace::TMP_DIR), "Products/Applications") 
+      # puts application_path.red
+      return nil unless File.exist?(application_path)
+      mobileprovision = File.join(Dir.glob("#{application_path}/*.app").first, 'embedded.mobileprovision')
+      return nil unless File.exist?(mobileprovision)
+
+      # puts "mobileprovision: #{mobileprovision}".red
       team_id = XcodeTool::Mobileprovision.new(mobileprovision).team_identifier
-      if team_id != ""
-        @configs = {teamID: team_id.chomp} 
-      end
+      @configs[:teamID] = team_id.chomp 
     end
 
     def add_configuration(key, value)
@@ -68,5 +72,11 @@ module Workspace
       key = key.gsub(/id|Id/, 'ID') if key =~ /id|Id/
       @configs[key.to_sym] = value
     end
+
+    def get_configuration(key)
+      key = key.sub(/_\w/) { |e| e.delete('_').upcase } if key.index('_')
+      key = key.gsub(/id|Id/, 'ID') if key =~ /id|Id/ 
+      @configs[key.to_sym]
+    end
   end
 end

data/lib/bean/export_options_plist.rb

@@ -4,9 +4,6 @@ module ExportOptions
   class Plist
     ALL_KEYS = %w(compileBitcode method signingStyle teamID thinning)
 
-    # The ExportOptions plist file
-    attr_reader :export_options_plist_file  
-
     def initialize(name)
       @export_options_plist_file = File.join(Workspace::TMP_DIR, "#{name.to_s.capitalize}-ExportOptions.plist")
 
@@ -37,12 +34,10 @@ module ExportOptions
       undef_method m unless m.to_s =~ /^__|send|method_missing|export_options_plist_file|object_id|response_to?/
     end
 
-    def self.exist?(name)
-      ALL_KEYS.include?(name.to_s)
-      # puts ALL_KEYS.include?(name.to_s) 
-    end
-
     def method_missing(m, *args) 
+      if m.to_s == 'export_options_plist_file'
+        return @export_options_plist_file
+      end
       # puts "Plist call #{m.to_s}(#{args.join(',')})"
       return unless ALL_KEYS.include? m.to_s
 
@@ -50,5 +45,13 @@ module ExportOptions
       plist_buddy.send m.to_sym, args.join(', ')
     end
 
+    def self.exist?(name)
+      ALL_KEYS.include?(name.to_s)
+      # puts ALL_KEYS.include?(name.to_s) 
+    end
+
+    def export_options_plist_file
+      @export_options_plist_file
+    end
   end
 end

data/lib/bean/runner.rb

@@ -6,15 +6,24 @@ require_relative 'colored'
 
 module Bean
   class Runner
-    def exec(name)
-      bean_file = Workspace::BEAN_FILE
-      puts "Beanfile: #{bean_file}"
+    def init
+      beanfile = Workspace::BEAN_FILE
+      return puts "Beanfile already exist." if File.exist?(beanfile)
 
-      unless Workspace.bean?
-        puts "BeanFile does not exist.".red
-        return
+      File.open(beanfile, 'w') do |f|
+        f.write <<-"..."
+        bean :dev do |a|
+          a.workspace = '<Your Workspace>'
+          a.scheme = '<Your scheme>'
+        end
+        ...
       end
-      
+    end
+
+    def exec(name)
+      return init if name.to_s == 'init'
+      bean_file = Workspace::BEAN_FILE
+      return puts "Beanfile does not exist.".red unless Workspace.bean?
       Action::BeanAction.new(bean_file).run(name)
     end
   end

data/lib/bean/table.rb

@@ -5,7 +5,7 @@ class Table
 
   def initialize(map)
     @map = map
-    @left_dash = 10
+    @left_dash = 20
     @right_dash = 20
   end
 
@@ -23,11 +23,11 @@ class Table
 
   def header
     max
-    left = @left_dash - 3
-    right = @right_dash - 5
+    left = @left_dash - 6
+    right = @right_dash - 12
 
     r = line
-    r << "| Key#{indent(left)} | Value#{indent(right)} |\n"
+    r << "| Option#{indent(left)} | Configuraton#{indent(right)} |\n"
     r << line
   end
 

data/lib/bean/xcode_tool.rb

@@ -14,7 +14,6 @@ module XcodeTool
     def method_missing(m, *args) 
       # puts "PlistBuddy call #{m.to_s}, args: #{args}"
       # return unless m.to_s.include?('=')
-
       key = m.to_s
       format_plist(key, args)
     end
@@ -38,8 +37,6 @@ module XcodeTool
       # If key contain `id` or `Id`, replace it with `ID`
       key = key.gsub(/id|Id/, 'ID') if key =~ /id|Id/
 
-      puts "#{key} #{args}"
-
       _args = args.join().split(", ")
       key = key.delete('=') if key.index('=')      
       name = exit?(key) ? 'Set' : 'Add'

data/lib/bean/xcodebuild.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby -W
 
 require_relative 'colored'
+require 'time'
 
 module XcodeBuilder
   class Archiver
     def self.archive(config)
-      puts config
+      
       workspace = config.workspace
       scheme = config.scheme
       export_path = config.export_path
@@ -13,18 +14,27 @@ module XcodeBuilder
       Dir.mkdir(tmp_dir) unless Dir.exist?(tmp_dir)
 
       # The archivePath is /your/project/root/.Tmp/scheme.xcarchive
-
       archive_path = File.expand_path("#{scheme}.xcarchive", tmp_dir)
       archive_command = "xcodebuild -workspace #{workspace} -scheme #{scheme} clean archive -archivePath #{archive_path}"
+     
+      begin_time = Time.now
+     
       # puts archive_command.red
-      export_option_plist = config.export_options_plist.export_options_plist_file
+      return Workspace.clear unless system archive_command
+
+      # If the ExportOptionsPlist does not exist, just return.
+      return unless export_option_plist = config.export_options_plist
+
+      # Print the config
+      puts config
+
       export_command = "xcodebuild -exportArchive -archivePath #{archive_path} -exportPath #{export_path} -exportOptionsPlist #{export_option_plist}"
       # puts export_command.red
-      
-      system archive_command
-      system export_command
+      return Workspace.clear unless system export_command
 
       Workspace.clear
+      duration = (Time.now - begin_time) / 60
+      puts "🎉🎉🎉 Done. It takes you #{duration.to_i.to_s.yellow} min."
     end
 
   end

data/lib/test.rb

@@ -1,13 +1,18 @@
 #!/usr/bin/env ruby -W
 
-require_relative 'bean'
+require_relative 'xbean'
 
 # plist = ExportOptions::Plist.new
 # plist.team_id = 'TeamIDDDD'
 # plist.user_id = 'user', 'string'
 # plist.compile_bitcode = 'true', 'bool'
 
-# path = "/Users/huluobo/Developer/xiaoDian/Example/xiaoDian-Example.xcarchive/Products/Applications/xiaoDian_Example.app/embedded.mobileprovision"
+# path = "/Users/huluobo/Developer/xiaoDian/Example/.Tmp/xiaoDian-Example.xcarchive/Products/Applications/xiaoDian-Example.app/embedded.mobileprovision"
+
+#  path = "/Users/huluobo/Developer/xiaoDian/Example/.Tmp/xiaoDian-Example.xcarchive/Products/Applications/xiaoDian_Example.app/embedded.mobileprovision" 
+
+#  puts path
+
 # m = XcodeTool::Mobileprovision.new(path)
 # puts m.team_identifier
 # m.team_name

data/xbean.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xbean'
-  s.version     = '0.0.1'
+  s.version     = '0.0.5'
   s.date        = '2018-07-16'
   s.summary     = "Archiver for iOS."
-  s.description = "An Arciver tool for iOS."
+  s.description = "A tool to Arcive iOS App."
   s.authors     = ["jewelz"]
   s.email       = 'hujewelz@163.com'
   s.files       = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xbean
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - jewelz
@@ -10,13 +10,14 @@ bindir: bin
 cert_chain: []
 date: 2018-07-16 00:00:00.000000000 Z
 dependencies: []
-description: An Arciver tool for iOS.
+description: A tool to Arcive iOS App.
 email: hujewelz@163.com
 executables:
 - xbean
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - README.md
 - bin/xbean
 - lib/bean/action.rb
@@ -30,6 +31,7 @@ files:
 - lib/bean/xcodebuild.rb
 - lib/test.rb
 - lib/xbean.rb
+- xbean-0.0.1.gem
 - xbean.gemspec
 homepage: https://github.com/hujewelz/bean.git
 licenses: