fixbraces 0.9.0

data/lib/fixbraces.rb

@@ -0,0 +1,25 @@
+require "fixbraces/version"
+require "tempfile"
+
+module Fixbraces
+  def Fixbraces.fixbraces(text)
+    # Move the opening brace to the same line as the opening clause
+    partial_result = text.gsub(/\n[ \t]*\{[ \t]*$/, " {")
+
+    # If there are a pair of braces on their own line move them both up to the
+    # same line as the opening line
+    partial_result.gsub(/\n[\s]*\{\}[\s]*$/, " {}")
+  end
+
+  def Fixbraces.process_file(file)
+    temp_file = Tempfile.new "fixbraces"
+    File.open(file, "r") do |f|
+      contents = f.read
+      new_contents = fixbraces contents
+      temp_file.write new_contents
+    end
+    temp_file.close
+    FileUtils.cp temp_file.path, file
+    temp_file.unlink
+  end
+end

data/spec/fixbraces_spec.rb

@@ -0,0 +1,67 @@
+require 'fixbraces'
+require_relative './fixtures/sample_text'
+
+describe Fixbraces do
+  let(:split_braces) { "- (void)someMethod\n{  \n    return;\n}" }
+  let(:corrected_split_braces) { "- (void)someMethod {\n    return;\n}" }
+  let(:paired_braces) { "@interface SomeClass ()\n{}  \n@end" }
+  let(:corrected_paired_braces) { "@interface SomeClass () {}\n@end" }
+  let(:input) { SampleText::INPUT }
+  let(:expected) { SampleText::EXPECTED }
+
+  describe "#fixbraces" do
+    it "correctly puts the opening brace on the same line" do
+      expect(Fixbraces.fixbraces split_braces).to eq corrected_split_braces
+    end
+
+    it "correctly puts paired empty braces on the opening line" do
+      expect(Fixbraces.fixbraces paired_braces).to eq corrected_paired_braces
+    end
+
+    it "correctly puts paired empty braces on the opening line" do
+      expect(Fixbraces.fixbraces paired_braces).to eq corrected_paired_braces
+    end
+
+    it "operates on strings with more than one correction to make" do
+      expect(Fixbraces.fixbraces input).to eq expected
+    end
+
+    it "doesn't change text that is correctly formatted" do
+      expect(Fixbraces.fixbraces corrected_split_braces).to eq corrected_split_braces
+      expect(Fixbraces.fixbraces corrected_paired_braces).to eq corrected_paired_braces
+    end
+  end
+
+  describe "#process_file" do
+    before(:each) do
+      tests_dir = Dir.pwd + "/tmp/spec/"
+
+      if File.exists? tests_dir
+        FileUtils.rm_rf tests_dir
+      end
+
+      FileUtils.mkdir_p tests_dir
+
+      FileUtils.cp_r Dir.pwd + "/spec/fixtures/input/.", tests_dir
+    end
+
+    after(:each) do
+      tests_dir = Dir.pwd + "/tmp/spec/"
+
+      if File.exists? tests_dir
+        FileUtils.rm_rf tests_dir
+      end
+    end
+
+    it "manages to update multiple files" do
+      files = Dir.glob Dir.pwd + "/tmp/spec/*.{h,m}"
+      files.each do |f|
+        Fixbraces.process_file f
+      end
+
+      result = `diff -r --brief #{Dir.pwd + "/tmp/spec/"} #{Dir.pwd + "/spec/fixtures/expected/"}`
+      expect(result).to eq ""
+    end
+  end
+
+end

data/spec/fixtures/expected/AppDelegate.h

@@ -0,0 +1,13 @@
+//
+//  AppDelegate.h
+//  FixbracesTestProject
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end

data/spec/fixtures/expected/AppDelegate.m

@@ -0,0 +1,38 @@
+//
+//  AppDelegate.m
+//  FixbracesTestProject
+//
+//
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    // Override point for customization after application launch.
+    return YES;
+}
+							
+- (void)applicationWillResignActive:(UIApplication *)application {
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
+@end

data/spec/fixtures/expected/MasterViewController.h

@@ -0,0 +1,10 @@
+//
+//  MasterViewController.h
+//  FixbracesTestProject
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MasterViewController : UITableViewController {}
+@end

data/spec/fixtures/expected/MasterViewController.m

@@ -0,0 +1,99 @@
+//
+//  MasterViewController.m
+//  FixbracesTestProject
+//
+//
+
+#import "MasterViewController.h"
+
+#import "DetailViewController.h"
+
+@interface MasterViewController () {
+    NSMutableArray *_objects;
+}
+@end
+
+@implementation MasterViewController
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+	// Do any additional setup after loading the view, typically from a nib.
+    self.navigationItem.leftBarButtonItem = self.editButtonItem;
+
+    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(insertNewObject:)];
+    self.navigationItem.rightBarButtonItem = addButton;
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)insertNewObject:(id)sender {
+    if (!_objects) {
+        _objects = [[NSMutableArray alloc] init];
+    }
+    [_objects insertObject:[NSDate date] atIndex:0];
+    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    [self.tableView insertRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
+}
+
+#pragma mark - Table View
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return _objects.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
+
+    NSDate *object = _objects[indexPath.row];
+    cell.textLabel.text = [object description];
+    return cell;
+}
+
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        [_objects removeObjectAtIndex:indexPath.row];
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view.
+    }
+}
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if ([[segue identifier] isEqualToString:@"showDetail"]) {
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        NSDate *object = _objects[indexPath.row];
+        [[segue destinationViewController] setDetailItem:object];
+    }
+}
+
+@end

data/spec/fixtures/input/AppDelegate.h

@@ -0,0 +1,13 @@
+//
+//  AppDelegate.h
+//  FixbracesTestProject
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end

data/spec/fixtures/input/AppDelegate.m

@@ -0,0 +1,44 @@
+//
+//  AppDelegate.m
+//  FixbracesTestProject
+//
+//
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    // Override point for customization after application launch.
+    return YES;
+}
+							
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
+@end

data/spec/fixtures/input/MasterViewController.h

@@ -0,0 +1,12 @@
+//
+//  MasterViewController.h
+//  FixbracesTestProject
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MasterViewController : UITableViewController
+{}
+
+@end

data/spec/fixtures/input/MasterViewController.m

@@ -0,0 +1,111 @@
+//
+//  MasterViewController.m
+//  FixbracesTestProject
+//
+//
+
+#import "MasterViewController.h"
+
+#import "DetailViewController.h"
+
+@interface MasterViewController () {
+    NSMutableArray *_objects;
+}
+@end
+
+@implementation MasterViewController
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view, typically from a nib.
+    self.navigationItem.leftBarButtonItem = self.editButtonItem;
+
+    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(insertNewObject:)];
+    self.navigationItem.rightBarButtonItem = addButton;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)insertNewObject:(id)sender
+{
+    if (!_objects) {
+        _objects = [[NSMutableArray alloc] init];
+    }
+    [_objects insertObject:[NSDate date] atIndex:0];
+    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
+    [self.tableView insertRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
+}
+
+#pragma mark - Table View
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return _objects.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
+
+    NSDate *object = _objects[indexPath.row];
+    cell.textLabel.text = [object description];
+    return cell;
+}
+
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        [_objects removeObjectAtIndex:indexPath.row];
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view.
+    }
+}
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath
+{
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
+{
+    if ([[segue identifier] isEqualToString:@"showDetail"]) {
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        NSDate *object = _objects[indexPath.row];
+        [[segue destinationViewController] setDetailItem:object];
+    }
+}
+
+@end

data/spec/fixtures/sample_text.rb

@@ -0,0 +1,112 @@
+# Sample texts ond expected results for testing
+
+module SampleText
+  INPUT=<<INPFB
+#import "ViewController.h"
+
+@interface ViewController {}
+
+@end
+
+
+@interface ViewController (AnotherCategory)
+{}
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+        // A load of spurious conditionals to test formatting.
+
+    if (nil)
+    {
+        NSLog(@"Nothing to see here");
+    } else if (!nil)
+    {
+        NSLog(@"Nothing more to see here");
+    } else
+    {
+        NSLog(@"We really shouldn't get to here");
+    }
+
+    for (NSInteger idx = 0; idx < 2; idx++)
+    {
+        NSLog(@"Print index");
+    }
+
+    NSUInteger anIndex= 0;
+    while (anIndex)
+    {
+        NSLog(@"Increment anIndex");
+        anIndex++;
+    }
+
+    switch (anIndex)
+    {
+        case 1:
+        {
+            NSLog(@"Switch in anIndex");
+            break;
+        }
+
+        default:
+            break;
+    }
+
+}
+
+@end
+INPFB
+
+  EXPECTED =<<EXPFB
+#import "ViewController.h"
+
+@interface ViewController {}
+
+@end
+
+
+@interface ViewController (AnotherCategory) {}
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+        // A load of spurious conditionals to test formatting.
+
+    if (nil) {
+        NSLog(@"Nothing to see here");
+    } else if (!nil) {
+        NSLog(@"Nothing more to see here");
+    } else {
+        NSLog(@"We really shouldn't get to here");
+    }
+
+    for (NSInteger idx = 0; idx < 2; idx++) {
+        NSLog(@"Print index");
+    }
+
+    NSUInteger anIndex= 0;
+    while (anIndex) {
+        NSLog(@"Increment anIndex");
+        anIndex++;
+    }
+
+    switch (anIndex) {
+        case 1: {
+            NSLog(@"Switch in anIndex");
+            break;
+        }
+
+        default:
+            break;
+    }
+
+}
+
+@end
+EXPFB
+end