Merge branch 'master' of https://github.com/y500/YYDebugDatabase

Author: yanqizhou

Cartfile

@@ -0,0 +1,3 @@
+
+github "swisspol/GCDWebServer"
+github "ccgus/fmdb"

DebugDatabase/DatabaseUtil.m

@@ -8,7 +8,14 @@
 
 #import "DatabaseUtil.h"
 #import <sqlite3.h>
+
+#ifdef COCOAPODS
 #import "FMDB.h"
+#else
+#import <FMDB/FMDB.h>
+#endif
+
+
 
 @interface DatabaseUtil ()
 

DebugDatabase/DebugDatabaseManager.h

@@ -7,7 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#ifdef COCOAPODS
 #import <GCDWebServer/GCDWebServer.h>
+#else
+#import <GCDWebServers/GCDWebServers.h>
+#endif
 
 @interface DebugDatabaseManager : GCDWebServer
 

DebugDatabase/DebugDatabaseManager.m

@@ -10,8 +10,14 @@
 #import "NSURL+scheme.h"
 #import "DatabaseUtil.h"
 #import "NSString+json.h"
-#import "GCDWebServerRequest.h"
-#import "GCDWebServerDataResponse.h"
+#ifdef COCOAPODS
+#import <GCDWebServer/GCDWebServerRequest.h>
+#import <GCDWebServer/GCDWebServerDataResponse.h>
+#else
+#import <GCDWebServers/GCDWebServerRequest.h>
+#import <GCDWebServers/GCDWebServerDataResponse.h>
+#endif
+
 
 @interface DebugDatabaseManager ()<GCDWebServerDelegate>
 

DebugDatabase/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

DebugDatabase/iOSDebugDatabase.h

@@ -0,0 +1,20 @@
+//
+//  iOSDebugDatabase.h
+//  iOSDebugDatabase
+//
+//  Created by Jan Chaloupecky on 16.12.17.
+//  Copyright © 2017 wentian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for iOSDebugDatabase.
+FOUNDATION_EXPORT double iOSDebugDatabaseVersionNumber;
+
+//! Project version string for iOSDebugDatabase.
+FOUNDATION_EXPORT const unsigned char iOSDebugDatabaseVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like
+#import <iOSDebugDatabase/DebugDatabaseManager.h>
+
+

README.md

@@ -15,6 +15,13 @@
 - [x] Download database.
 
 
+# <span style="color:red">Release 2.0.0:</span>
+* **Replace CocoaAsyncSocket with GCDWebServer, which is higher level server that more convenient.**
+* **Satisfy with Firefox, Safari, Chrome.**
+* **Use bonjourname as the server address, for example: http://y500.local, http://macbook.local:9002...**
+* **print link address and bonjour name of the server in the console**
+
+
 # Installation
 
 #### Podfile
@@ -32,6 +39,22 @@ use_frameworks!
 pod 'YYDebugDatabase'
 ```
 
+#### Carthage
+
+- Cartfile
+
+```
+github "y500/iOSDebugDatabase"
+```
+
+- run `carthage update`
+
+- Add all three `.frameworks` to your target "Embedd Frameworks" Build Phase:
+ 	- `iOSDebugDatabase.framework`
+	- `FMDB.framework`
+	- `GCDWebServers.framework`
+
+
 #### Not build in Release
 
 First, add configurations in Podfile.
@@ -52,7 +75,7 @@ $ pod install
 import at AppDelegate.m:
 
 ```objc
-#import YYDebugDatabaseManager.h
+#import DebugDatabaseManager.h
 ```
 
 making one line code at `application:didFinishLaunchingWithOptions`:
@@ -93,7 +116,7 @@ for example:
 ```objc
     NSString *resourceDirectory = [[NSBundle mainBundle] resourcePath];
     NSString *databaseDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/database"];
-    NSString *documentDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documnets"];
+    NSString *documentDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
     NSString *cacheDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Cache"];
     [[DebugDatabaseManager shared] startServerOnPort:9002 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]];
 ```
@@ -131,6 +154,15 @@ Important:
 - If you use Simulator you can use address: http://127.0.0.1:9002.
 - the port must be same as you write in Appdelegate.m
 
+###other more:
+
+you can find the address and bojourname address in the console like below:
+```
+[INFO] DebugDatabaseManager started on port 9002 and reachable at http://192.168.0.67:9002/
+[INFO] DebugDatabaseManager now locally reachable at http://y500.local:9002/
+```
+
+
 ### License
 ```
    Copyright (C) 2016 y500