pbind 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daffbf09983752ded6d29b3b64bf7d5f8d0bd776
-  data.tar.gz: 367f984121f3d3d13bed951a0063a5190b5e41cc
+  metadata.gz: 573151dfdd2acf6d1bbc018dff4cbfc196827213
+  data.tar.gz: f66ce1b7a90dd88c069e533e75c3d429e06128ee
 SHA512:
-  metadata.gz: feef5da07a5578c78c730231a3aeb2141b8ca5055be4ad29c453b77cf98f0e1e0696b7cabfd44e34111455225820e485a4392887bb84c2e547e375b5816fbf96
-  data.tar.gz: be7f7468246d76ceef180c1b408222af9b5d8c755769bdb1eb02b586617ddf0a4e651fe910d27fafeebb4613acfdf04a16e29b336f769d86696c6f175a4cd1ae
+  metadata.gz: d559bc9e5bf121749e96bc470f4c8f7b69dfdfbc2d39815da371456384b2a3e5e70ae3bb4fda47d112a5375549d0423ef0e7b66737ec8ea33e53f089878381cf
+  data.tar.gz: 845197b53f0976241409f41343dfab570d7fa50ea53c3cd7ca730f7651e5ad9c2b2a3d762c9ad1527c7dfc3bfc557018d6bf57bf9a7264d115868e2b6507eec1

data/lib/pbind/command.rb

@@ -1,8 +1,7 @@
 require 'colored'
 require 'claide'
 
-require 'cocoapods/config'
-require 'cocoapods/user_interface'
+require 'pbind/user_interface'
 
 module Pbind
   class Command < CLAide::Command
@@ -16,8 +15,6 @@ module Pbind
     self.description = 'Pbind, the Pbind XcodeProject Helper.'
     self.plugin_prefixes = %w(claide pbind)
 
-    UI = Pod::UI
-
     def self.report_error(exception)
       case exception
       when Interrupt

data/lib/pbind/command/mock.rb

@@ -27,6 +27,7 @@ module Pbind
       end
 
       def run
+        @action = @action.gsub(/\//, '-')
         @api_name = 'PBLocalhost'
         @project_root = File.dirname(@project_path)
         @api_install_dir = File.absolute_path(File.join(@project_root, @api_name))
@@ -57,14 +58,16 @@ module Pbind
         group = project.main_group.find_subpath(@api_name, true)
         if group.empty?
           group.clear
-          file_refs = Array.new
-          Dir.foreach(@api_install_dir) do |file|
-            if !File.directory?(file)
-              file_refs << group.new_reference(File.join(@api_install_dir, file))
+          UI.section("Create group \"PBLocalhost\"") do
+            file_refs = Array.new
+            Dir.foreach(@api_install_dir) do |file|
+              if !File.directory?(file)
+                file_refs << group.new_reference(File.join(@api_install_dir, file))
+              end
             end
+            target.add_file_references(file_refs)
+            changed = true
           end
-          target.add_file_references(file_refs)
-          changed = true
         end
 
         # Create directory
@@ -75,29 +78,43 @@ module Pbind
         end
 
         # Create json file
-        json_path = File.join(client_dir, "#{@action}.json")
+        json_name = "#{@action}.json"
+        json_path = File.join(client_dir, json_name)
+        json_relative_path = "PBLocalhost/#{@client}/#{json_name}"
         if !File.exists?(json_path)
-          json_file = File.new(json_path, 'w')
-          json_file.puts("{\n  \n}")
-          changed = true
+          UI.section("Creating file `#{json_name}`") do
+            json_file = File.new(json_path, 'w')
+            json_file.print("{\n  \n}")
+            changed = true
+          end
         end
 
         # Add json file reference
         group = group.find_subpath(@client, true)
+        added = true
         if group.empty?
           group.clear
+          added = false
+        else
+          found = group.files.index {|x| x.path==json_relative_path}
+          if found == nil
+            added = false
+          end
+        end
+
+        if !added
           file_refs = Array.new
           file_refs << group.new_reference(json_path)
           target.add_file_references(file_refs)
           changed = true
         end
 
-        # Save
         if !changed
           return
         end
 
-        UI.section("Creating PBLocalhost/#{@client}/#{@action}.json.") do
+        # Save
+        UI.section("Adding reference `#{json_name}`") do
           project.save
           @changed = true
         end

data/lib/pbind/command/watch.rb

@@ -53,15 +53,67 @@ module Pbind
       # @return [void]
       #
       def install_sources
-        if File.exists?(@src_install_dir)
-          return
+        source_dir = ENV['PBIND_SOURCE']
+        src_dir = File.join(source_dir, @src_name)
+
+        if !File.exists?(@src_install_dir)
+          UI.section("Copying `#{@src_name}` into `#{@project_root}`") do
+            FileUtils.cp_r src_dir, @project_root
+            @changed = true
+          end
+        else
+          # Check for upgrade.
+          Dir.foreach(@src_install_dir) do |filename|
+            if File.directory?(filename)
+              next
+            end
+
+            src_file = File.join(src_dir, filename)
+            if !File.exists?(src_file)
+              next
+            end
+            
+            dst_file = File.join(@src_install_dir, filename)
+            src_md5 = Digest::MD5.hexdigest( File.open(src_file, "rb"){|fs| fs.read} )
+            dst_md5 = Digest::MD5.hexdigest( File.open(dst_file, "rb"){|fs| fs.read} )
+            if src_md5 != dst_md5
+              UI.section("Upgrading `#{@src_name}/#{filename}`") do
+                FileUtils.cp src_file, dst_file
+                @changed = true
+              end
+            end
+          end
         end
 
-        source_dir = ENV['PBIND_SOURCE']
-        UI.section("Copying [`#{@src_name}`, `#{@api_name}`] into `#{@project_root}`.") do
-          FileUtils.cp_r File.join(source_dir, @src_name), @project_root
-          FileUtils.cp_r File.join(source_dir, @api_name), @project_root
-          @changed = true
+        src_dir = File.join(source_dir, @api_name)
+
+        if !File.exists?(@api_install_dir)
+          UI.section("Copying `#{@api_name}` into `#{@project_root}`") do
+            FileUtils.cp_r src_dir, @project_root
+            @changed = true
+          end
+        else
+          # Check for upgrade.
+          Dir.foreach(@api_install_dir) do |filename|
+            if File.directory?(filename)
+              next
+            end
+
+            src_file = File.join(src_dir, filename)
+            if !File.exists?(src_file)
+              next
+            end
+
+            dst_file = File.join(@api_install_dir, filename)
+            src_md5 = Digest::MD5.hexdigest(File.open(src_file, "rb"){|fs| fs.read} )
+            dst_md5 = Digest::MD5.hexdigest(File.open(dst_file, "rb"){|fs| fs.read} )
+            if src_md5 != dst_md5
+              UI.section("Upgrading `#{@api_name}/#{filename}`") do
+                FileUtils.cp src_file, dst_file
+                @changed = true
+              end
+            end
+          end
         end
       end
 
@@ -100,7 +152,7 @@ module Pbind
           return
         end
 
-        UI.section("Add plist entires to `#{@project_path}`.") do
+        UI.section("Adding plist entires to `#{@project_path}`") do
           Xcodeproj::Plist.write_to_path(plist, info_plist_path)
           @changed = true
         end
@@ -148,7 +200,7 @@ module Pbind
           return
         end
 
-        UI.section("Add group [`#{@src_name}`, `#{@api_name}`] to `#{@project_path}`.") do
+        UI.section("Adding group references to `#{@project_path}`") do
           project.save
           @changed = true
         end

data/lib/pbind/user_interface.rb

@@ -0,0 +1,23 @@
+module Pbind
+  module UI
+
+    require "colored"
+
+    class << self
+
+      def section(title)
+        message = "%-64s" % title
+        print message.yellow
+
+        yield if block_given?
+
+        puts '[  OK  ]'.green
+      end
+
+      def notice(message)
+        puts ''
+        puts "[!] #{message}".green
+      end
+    end
+  end
+end

data/source/PBLiveLoader/PBLiveLoader.m

@@ -14,9 +14,12 @@
 
 @implementation PBLiveLoader
 
-static NSString *const PLIST_SUFFIX = @".plist";
-static NSString *const JSON_SUFFIX = @".json";
-static NSString *const IGNORES_SUFFIX = @"ignore.h";
+static NSString *const kPlistSuffix = @".plist";
+static NSString *const kJSONSuffix = @".json";
+static NSString *const kIgnoresFile = @"ignore.h";
+
+static NSString *const kDebugJSONRedirectKey = @"$redirect";
+static NSString *const kDebugJSONStatusKey = @"$status";
 
 static NSArray<NSString *> *kIgnoreAPIs;
 static PBDirectoryWatcher  *kResWatcher;
@@ -45,12 +48,12 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
 + (void)watchPlist {
     NSString *resPath = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"PBResourcesPath"];
     if (resPath == nil) {
-        NSLog(@"PBPlayground: Please define PBResourcesPath in Info.plist with value '$(SRCROOT)/[path-to-resources]'!");
+        NSLog(@"PBLiveLoader: Please define PBResourcesPath in Info.plist with value '$(SRCROOT)/[path-to-resources]'!");
         return;
     }
     
     if (![[NSFileManager defaultManager] fileExistsAtPath:resPath]) {
-        NSLog(@"PBPlayground: PBResourcesPath is not exists! (%@)", resPath);
+        NSLog(@"PBLiveLoader: PBResourcesPath is not exists! (%@)", resPath);
         return;
     }
     
@@ -58,20 +61,20 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
     [kResWatcher watchDir:resPath handler:^(NSString *path, BOOL initial, PBDirEvent event) {
         switch (event) {
             case PBDirEventNewFile:
-                if (HasSuffix(path, PLIST_SUFFIX)) {
+                if (HasSuffix(path, kPlistSuffix)) {
                     NSBundle *updatedBundle = [NSBundle bundleWithPath:[path stringByDeletingLastPathComponent]];
                     [Pbind addResourcesBundle:updatedBundle];
                 }
                 break;
             
             case PBDirEventModifyFile:
-                if (HasSuffix(path, PLIST_SUFFIX)) {
+                if (HasSuffix(path, kPlistSuffix)) {
                     [Pbind reloadViewsOnPlistUpdate:path];
                 }
                 break;
             
             case PBDirEventDeleteFile:
-                if (HasSuffix(path, PLIST_SUFFIX)) {
+                if (HasSuffix(path, kPlistSuffix)) {
                     [Pbind reloadViewsOnPlistUpdate:path];
                 }
                 break;
@@ -85,12 +88,12 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
 + (void)watchAPI {
     NSString *serverPath = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"PBLocalhost"];
     if (serverPath == nil) {
-        NSLog(@"PBPlayground: Please define PBLocalhost in Info.plist with value '$(SRCROOT)/[path-to-api]'!");
+        NSLog(@"PBLiveLoader: Please define PBLocalhost in Info.plist with value '$(SRCROOT)/[path-to-api]'!");
         return;
     }
     
     if (![[NSFileManager defaultManager] fileExistsAtPath:serverPath]) {
-        NSLog(@"PBPlayground: PBLocalhost is not exists! (%@)", serverPath);
+        NSLog(@"PBLiveLoader: PBLocalhost is not exists! (%@)", serverPath);
         return;
     }
     
@@ -98,23 +101,23 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
     [kAPIWatcher watchDir:serverPath handler:^(NSString *path, BOOL initial, PBDirEvent event) {
         switch (event) {
             case PBDirEventNewFile:
-                if (HasSuffix(path, IGNORES_SUFFIX)) {
+                if (HasSuffix(path, kIgnoresFile)) {
                     kIgnoreAPIs = [self ignoreAPIsWithContentsOfFile:path];
                 }
                 break;
                 
             case PBDirEventModifyFile:
-                if (HasSuffix(path, JSON_SUFFIX)) {
+                if (HasSuffix(path, kJSONSuffix)) {
                     [self reloadViewsOnJSONChange:path deleted:NO];
-                } else if (HasSuffix(path, IGNORES_SUFFIX)) {
+                } else if (HasSuffix(path, kIgnoresFile)) {
                     [self reloadViewsOnIgnoresChange:path deleted:NO];
                 }
                 break;
                 
             case PBDirEventDeleteFile:
-                if (HasSuffix(path, JSON_SUFFIX)) {
+                if (HasSuffix(path, kJSONSuffix)) {
                     [self reloadViewsOnJSONChange:path deleted:YES];
-                } else if (HasSuffix(path, IGNORES_SUFFIX)) {
+                } else if (HasSuffix(path, kIgnoresFile)) {
                     [self reloadViewsOnIgnoresChange:path deleted:YES];
                 }
                 break;
@@ -130,6 +133,11 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
             action = [action substringFromIndex:1]; // bypass '/'
         }
         
+        NSString *method = request.method;
+        if (method != nil && ![method isEqualToString:@"GET"]) {
+            action = [action stringByAppendingFormat:@"@%@", [method lowercaseString]];
+        }
+        action = [action stringByReplacingOccurrencesOfString:@"/" withString:@"-"];
         if (kIgnoreAPIs != nil && [kIgnoreAPIs containsObject:action]) {
             return nil;
         }
@@ -137,17 +145,41 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
         NSString *jsonName = [NSString stringWithFormat:@"%@/%@.json", [[client class] description], action];
         NSString *jsonPath = [serverPath stringByAppendingPathComponent:jsonName];
         if (![[NSFileManager defaultManager] fileExistsAtPath:jsonPath]) {
-            NSLog(@"PBPlayground: Missing '%@', ignores!", jsonName);
+            NSLog(@"PBLiveLoader: Missing '%@', ignores!", jsonName);
             return nil;
         }
         NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
         NSError *error = nil;
-        id response = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
+        
+        PBResponse *response = [[PBResponse alloc] init];
+        response.data = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
         if (error != nil) {
-            NSLog(@"PBPlayground: Invalid '%@', ignores!", jsonName);
+            NSLog(@"PBLiveLoader: Invalid '%@', ignores! The file format should be pure JSON style.", jsonName);
             return nil;
         }
         
+        if ([response.data isKindOfClass:[NSDictionary class]]) {
+            NSString *redirect = [response.data objectForKey:kDebugJSONRedirectKey];
+            if (redirect != nil) {
+                PBExpression *expression = [PBExpression expressionWithString:redirect];
+                if (expression != nil) {
+                    response.data = [expression valueWithData:nil];
+                }
+            } else {
+                NSString *statusString = [response.data objectForKey:kDebugJSONStatusKey];
+                if (statusString != nil) {
+                    response.status = [statusString intValue];
+                }
+                NSMutableDictionary *filteredDict = [NSMutableDictionary dictionaryWithDictionary:response.data];
+                [filteredDict removeObjectForKey:kDebugJSONStatusKey];
+                if (filteredDict.count == 0) {
+                    response.data = nil;
+                } else {
+                    response.data = filteredDict;
+                }
+            }
+        }
+        
         return response;
     }];
 }
@@ -181,7 +213,6 @@ static BOOL HasSuffix(NSString *src, NSString *tail)
     }
     
     NSArray *changedIgnores;
-    
     if (oldIgnores != nil) {
         NSArray *deletedIgnores = [oldIgnores filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"NOT SELF IN %@", newIgnores]];
         NSArray *addedIgnores = [newIgnores filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"NOT SELF IN %@", oldIgnores]];

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbind
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Galen Lin
@@ -62,6 +62,7 @@ files:
 - lib/pbind/command.rb
 - lib/pbind/command/mock.rb
 - lib/pbind/command/watch.rb
+- lib/pbind/user_interface.rb
 - source/PBLiveLoader/PBDirectoryWatcher.h
 - source/PBLiveLoader/PBDirectoryWatcher.m
 - source/PBLiveLoader/PBLiveLoader.h